2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-06 00:37:52 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge pull request #141 from Parabot/development

Browse Source 
[MERGE] Development into master
This commit is contained in:
Jeroen Ketelaar
2016-10-24 01:53:07 +02:00
committed by GitHub
parent aa5e8394c4 1ae77befe9
commit 9bcd664bfc
83 changed files with 1274 additions and 2784 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/ISSUE_TEMPLATE.md
+20
View File
@@ -0,0 +1,20 @@
* Provide a general summary of the issue in the **Title** above.
* Before you open an issue, please check if a similar issue already exists or has been closed before.
### Important
Mark with [x] to select. Leave as [ ] to unselect.
### When reporting a bug/issue:
- [ ] Screenshot
- [ ] The Parabot version and the operating system you're using
- [ ] The behavior you expect to see, and the actual behavior
- [ ] Steps to reproduce the behavior
- [ ] \(optional) Possible solution/fix/workaround
### When you open an issue for a change/improvement/feature request:
- [ ] A description of the problem you're trying to solve, including _why_ you think this is a problem
- [ ] If the feature changes current behavior, reasons why your solution is better
- [ ] \(optional) Possible solution/fix/workaround
### Description
...
.github/PULL_REQUEST_TEMPLATE.md
+37
View File
@@ -0,0 +1,37 @@
Provide a general summary of your changes in the **Title** above.
### Important
Mark with [x] to select. Leave as [ ] to unselect.
If possible; include a screenshot or gif of the change you've made
### Motivation and Context
Each item you can check should be described in the _Description_ section.
- [ ] Why is this change required? What problem does it solve?
- [ ] If it fixes an open issue, include the text `Closes issue #1` (where 1 would be the issue number) to your commit message.
### Types of changes
What types of changes does your code introduce? Check all the boxes that apply:
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] Cleanup (non-breaking change which cleans up the code)
### Final checklist
Go over all the following points and check all the boxes that apply.
If you're unsure about any of these, don't hesitate to ask. We're here to help!
Various areas of the codebase have been worked on by different people in recent years, so if you are unfamiliar with the general area you're working in, please feel free to chat with people who have experience in that area.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have tested the functionality
- [ ] I have added tests for this functionality
Your pull request will be tested via Travis CI to automatically indicate that your changes do not prevent compilation.
If it reports back that there are problems, you go to [the Travis system](https://travis-ci.org/Parabot/Parabot) and check the log report for your pull request to see what the problem was.
If you add new code to fix a Travis building issue/problem, then take note that you need to check the next pull request in the Travis system.
Travis issue numbers are different from GitHub issue numbers.
### Description
...
.github/labels.yml
+30
View File
@@ -0,0 +1,30 @@
- name: priority:low
color: bfe5bf
- name: priority:medium
color: bfe5bf
- name: priority:high
color: bfe5bf
- name: status:accepted
color: fef2c0
- name: status:unconfirmed
color: fef2c0
- name: status:needs more info
color: fef2c0
- name: status:rejected
color: fef2c0
- name: status:under consideration
color: fef2c0
- name: type:bug
color: f7c6c7
- name: type:feature
color: f7c6c7
- name: type:improvement
color: f7c6c7
- name: type:question
color: f7c6c7
- name: os:windows
color: "666699"
- name: os:mac
color: "666699"
- name: os:other
color: "666699"
.gitlab-ci.yml
-7
View File
@@ -1,7 +0,0 @@
before_script:
- mvn clean
production:
script:
- mvn -U package -Dsettings.security=/home/ci/settings.xml
type: deploy
.travis.yml
+31 -10
View File
@@ -1,15 +1,23 @@
language: java language: java
jdk: jdk:
- oraclejdk7 - oraclejdk7
- oraclejdk8
before_install: before_install:
- chmod +x ./.travis/artifact-upload.sh
- chmod +x ./.travis/maven-build.sh - chmod +x ./.travis/maven-build.sh
- chmod +x ./.travis/call-creation.sh
- mvn clean
script: ./.travis/maven-build.sh install:
- sudo apt-get update && sudo apt-get --assume-yes install zip unzip
script: "./.travis/maven-build.sh"
after_deploy: "./.travis/call-creation.sh"
notifications: notifications:
email: false
slack: slack:
secure: ciAOsdv9lf/IbAwyzeR/z2nlBSevmBHBqca6tf0Yh2DIyAx/uUo1ojon0W7Kv6tCECGhSTdfQAnZ+nFjjqaRs+Jq4svd9WKYrFuZyOWmT31iSJ/nvPymRvevSsgwpSKr0nJS9dxePKto/T3ozW29kx88eaJQH17zOaX2rfuIje4= secure: ciAOsdv9lf/IbAwyzeR/z2nlBSevmBHBqca6tf0Yh2DIyAx/uUo1ojon0W7Kv6tCECGhSTdfQAnZ+nFjjqaRs+Jq4svd9WKYrFuZyOWmT31iSJ/nvPymRvevSsgwpSKr0nJS9dxePKto/T3ozW29kx88eaJQH17zOaX2rfuIje4=
webhooks: webhooks:
@@ -24,13 +32,26 @@ env:
- secure: UG+b1tEgc8xv9x4r//2OAIK1RrYv6n209KTTFMMwcnAa7DI8HaP8nljRa5/VhDhuKHdlVrYH/tI90v7UVBs0GDVNwK5V17Io0fMm3FUGZekSthTCqqno5wAGa9r6a6mMLtSaSmIFeIKi0+0d2ZwplRuhj/dtEYjjBBj+kK8g4nE= - secure: UG+b1tEgc8xv9x4r//2OAIK1RrYv6n209KTTFMMwcnAa7DI8HaP8nljRa5/VhDhuKHdlVrYH/tI90v7UVBs0GDVNwK5V17Io0fMm3FUGZekSthTCqqno5wAGa9r6a6mMLtSaSmIFeIKi0+0d2ZwplRuhj/dtEYjjBBj+kK8g4nE=
- secure: St/fecUDInFBCRriYqgp2F8PU9/SooorgxD9Mrs+b0EsC7AbtSsQXvdIv2Lp6xzdQ0VSXPcLIhULPOYrmBKnGQ/NjXTIZXxnroyQxxnI6xyEWIZwiHRY/bKRJDRbQTxD9NL32szKiDSwnw7pu6llF4D64UqQvziq4Gm6VohU75M= - secure: St/fecUDInFBCRriYqgp2F8PU9/SooorgxD9Mrs+b0EsC7AbtSsQXvdIv2Lp6xzdQ0VSXPcLIhULPOYrmBKnGQ/NjXTIZXxnroyQxxnI6xyEWIZwiHRY/bKRJDRbQTxD9NL32szKiDSwnw7pu6llF4D64UqQvziq4Gm6VohU75M=
- secure: bD15GVZWowiknbfLavh8CxSh0GsnF5kT4kZ6ggCuUDGyj0mzqf7dNRnchQIKkCG0WRYyTrFN4pEiygeywWsipEeAVv9Xhx3cuUZmzeQaR5KCWabSwJ8gK6jZd1YhcWmM9vrdPHobZr65MP0y/8mu/Fovgky9dY7KDf4G3SebNrM= - secure: bD15GVZWowiknbfLavh8CxSh0GsnF5kT4kZ6ggCuUDGyj0mzqf7dNRnchQIKkCG0WRYyTrFN4pEiygeywWsipEeAVv9Xhx3cuUZmzeQaR5KCWabSwJ8gK6jZd1YhcWmM9vrdPHobZr65MP0y/8mu/Fovgky9dY7KDf4G3SebNrM=
- PARABOT_VERSION=2.6.0
addons:
artifacts:
paths: ./target/final/
s3_region: "us-west-1"
cache: cache:
directories: directories:
- .autoconf - ".autoconf"
- $HOME/.m2 - "$HOME/.m2"
deploy:
- provider: s3
access_key_id: AKIAJDZLZNH2PIKHUKOA
secret_access_key:
secure: MTOqhji8t8DcGRsfZEitMTqMemqxIag4a3dI0SBeWKBMpDCcKOokhGbXFCUBvMukU6tKIFfMo15z2wERZQxCVAxMt7dr1cyuWb49Sdy+mnBR6Z3EsJ2suilBe6b+9odLJVplCQVRPz9VyKnllWwO9D5j/ZpQaf8fb1675PB6feY=
bucket: parabot
skip_cleanup: true
local-dir: "./target/final/"
upload-dir: "artifacts/client"
region: us-west-1
detect_encoding: true
acl: public_read
on:
repo: Parabot/Parabot
all_branches: true
jdk: 'oraclejdk7'
.travis/artifact-upload.sh
-8
View File
@@ -1,8 +0,0 @@
#! /bin/bash
local_file="$(ls $TRAVIS_BUILD_DIR/target/final/Parabot-V*.jar | head -n 1 | xargs -n 1 basename)"
local_path="$(ls $TRAVIS_BUILD_DIR/target/final/Parabot-V*.jar | head -n 1)"
target_url="ftp://$FTP_HOST/$local_file"
echo "Uploading $local_file to $target_url"
curl -us $FTP_USERNAME:$FTP_PASSWORD -T "$local_path" "$target_url"
.travis/call-creation.sh
Executable
+4
View File
@@ -0,0 +1,4 @@
#! /bin/bash
sleep 1
curl --data "build_id=$TRAVIS_BUILD_ID&version=$PARABOT_VERSION" "http://v3.bdn.parabot.org/api/bot/create/client"
.travis/maven-build.sh
+1 -1
View File
@@ -3,5 +3,5 @@
if [ "$TRAVIS_BRANCH" == "master" ]; then if [ "$TRAVIS_BRANCH" == "master" ]; then
mvn -U package mvn -U package
else else
mvn -Dversion="-RC-$TRAVIS_BUILD_ID" -U package mvn -Dbuild.version="-RC-$TRAVIS_BUILD_ID" -U package
fi fi
.travis/release.sh
+3
View File
@@ -0,0 +1,3 @@
#! /bin/bash
mvn install source:jar javadoc:jar deploy site-deploy
LICENSE.md
+613 -277
View File
@@ -1,339 +1,675 @@
GNU GENERAL PUBLIC LICENSE ### GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/> Version 3, 29 June 2007
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble Copyright (C) 2007 Free Software Foundation, Inc.
<http://fsf.org/>
The licenses for most software are designed to take away your Everyone is permitted to copy and distribute verbatim copies of this
freedom to share and change it. By contrast, the GNU General Public license document, but changing it is not allowed.
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not ### Preamble
price. Our General Public Licenses are designed to make sure that you
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 have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it them if you wish), that you receive source code or can get it if you
if you want it, that you can change the software or use pieces of it want it, that you can change the software or use pieces of it in new
in new free programs; and that you know you can do these things. free programs, and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid To protect your rights, we need to prevent others from denying you
anyone to deny you these rights or to ask you to surrender the rights. these rights or asking you to surrender the rights. Therefore, you
These restrictions translate to certain responsibilities for you if you have certain responsibilities if you distribute copies of the
distribute copies of the software, or if you modify it. software, or if you modify it: responsibilities to respect the freedom
of others.
For example, if you distribute copies of such a program, whether For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that gratis or for a fee, you must pass on to the recipients the same
you have. You must make sure that they, too, receive or can get the freedoms that you received. You must make sure that they, too, receive
source code. And you must show them these terms so they know their or can get the source code. And you must show them these terms so they
rights. know their rights.
We protect your rights with two steps: (1) copyright the software, and Developers that use the GNU GPL protect your rights with two steps:
(2) offer you this license which gives you legal permission to copy, (1) assert copyright on the software, and (2) offer you this License
distribute and/or modify the software. giving you legal permission to copy, distribute and/or modify it.
Also, for each author's protection and ours, we want to make certain For the developers' and authors' protection, the GPL clearly explains
that everyone understands that there is no warranty for this free that there is no warranty for this free software. For both users' and
software. If the software is modified by someone else and passed on, we authors' sake, the GPL requires that modified versions be marked as
want its recipients to know that what they have is not the original, so changed, so that their problems will not be attributed erroneously to
that any problems introduced by others will not reflect on the original authors of previous versions.
authors' reputations.
Finally, any free program is threatened constantly by software Some devices are designed to deny users access to install or run
patents. We wish to avoid the danger that redistributors of a free modified versions of the software inside them, although the
program will individually obtain patent licenses, in effect making the manufacturer can do so. This is fundamentally incompatible with the
program proprietary. To prevent this, we have made it clear that any aim of protecting users' freedom to change the software. The
patent must be licensed for everyone's free use or not licensed at all. 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.
The precise terms and conditions for copying, distribution and 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. modification follow.
GNU GENERAL PUBLIC LICENSE ### TERMS AND CONDITIONS
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains #### 0. Definitions.
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not "This License" refers to version 3 of the GNU General Public License.
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's "Copyright" also means copyright-like laws that apply to other kinds
source code as you receive it, in any medium, provided that you of works, such as semiconductor masks.
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and "The Program" refers to any copyrightable work licensed under this
you may at your option offer warranty protection in exchange for a fee. License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
2. You may modify your copy or copies of the Program or any portion To "modify" a work means to copy from or adapt all or part of the work
of it, thus forming a work based on the Program, and copy and in a fashion requiring copyright permission, other than the making of
distribute such modifications or work under the terms of Section 1 an exact copy. The resulting work is called a "modified version" of
above, provided that you also meet all of these conditions: the earlier work or a work "based on" the earlier work.
a) You must cause the modified files to carry prominent notices A "covered work" means either the unmodified Program or a work based
stating that you changed the files and the date of any change. on the Program.
b) You must cause any work that you distribute or publish, that in To "propagate" a work means to do anything with it that, without
whole or in part contains or is derived from the Program or any permission, would make you directly or secondarily liable for
part thereof, to be licensed as a whole at no charge to all third infringement under applicable copyright law, except executing it on a
parties under the terms of this License. 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.
c) If the modified program normally reads commands interactively To "convey" a work means any kind of propagation that enables other
when run, you must cause it, when started running for such parties to make or receive copies. Mere interaction with a user
interactive use in the most ordinary way, to print or display an through a computer network, with no transfer of a copy, is not
announcement including an appropriate copyright notice and a conveying.
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If An interactive user interface displays "Appropriate Legal Notices" to
identifiable sections of that work are not derived from the Program, the extent that it includes a convenient and prominently visible
and can be reasonably considered independent and separate works in feature that (1) displays an appropriate copyright notice, and (2)
themselves, then this License, and its terms, do not apply to those tells the user that there is no warranty for the work (except to the
sections when you distribute them as separate works. But when you extent that warranties are provided), that licensees may convey the
distribute the same sections as part of a whole which is a work based work under this License, and how to view a copy of this License. If
on the Program, the distribution of the whole must be on the terms of the interface presents a list of user commands or options, such as a
this License, whose permissions for other licensees extend to the menu, a prominent item in the list meets this criterion.
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest #### 1. Source Code.
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program The "source code" for a work means the preferred form of the work for
with the Program (or with a work based on the Program) on a volume of making modifications to it. "Object code" means any non-source form of
a storage or distribution medium does not bring the other work under a work.
the scope of this License.
3. You may copy and distribute the Program (or a work based on it, A "Standard Interface" means an interface that either is an official
under Section 2) in object code or executable form under the terms of standard defined by a recognized standards body, or, in the case of
Sections 1 and 2 above provided that you also do one of the following: interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
a) Accompany it with the complete corresponding machine-readable The "System Libraries" of an executable work include anything, other
source code, which must be distributed under the terms of Sections than the work as a whole, that (a) is included in the normal form of
1 and 2 above on a medium customarily used for software interchange; or, 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.
b) Accompany it with a written offer, valid for at least three The "Corresponding Source" for a work in object code form means all
years, to give any third party, for a charge no more than your the source code needed to generate, install, and (for an executable
cost of physically performing source distribution, a complete work) run the object code and to modify the work, including scripts to
machine-readable copy of the corresponding source code, to be control those activities. However, it does not include the work's
distributed under the terms of Sections 1 and 2 above on a medium System Libraries, or general-purpose tools or generally available free
customarily used for software interchange; or, 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.
c) Accompany it with the information you received as to the offer The Corresponding Source need not include anything that users can
to distribute corresponding source code. (This alternative is regenerate automatically from other parts of the Corresponding Source.
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for The Corresponding Source for a work in source code form is that same
making modifications to it. For an executable work, complete source work.
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering #### 2. Basic Permissions.
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program All rights granted under this License are granted for the term of
except as expressly provided under this License. Any attempt copyright on the Program, and are irrevocable provided the stated
otherwise to copy, modify, sublicense or distribute the Program is conditions are met. This License explicitly affirms your unlimited
void, and will automatically terminate your rights under this License. permission to run the unmodified Program. The output from running a
However, parties who have received copies, or rights, from you under covered work is covered by this License only if the output, given its
this License will not have their licenses terminated so long as such content, constitutes a covered work. This License acknowledges your
parties remain in full compliance. rights of fair use or other equivalent, as provided by copyright law.
5. You are not required to accept this License, since you have not You may make, run and propagate covered works that you do not convey,
signed it. However, nothing else grants you permission to modify or without conditions so long as your license otherwise remains in force.
distribute the Program or its derivative works. These actions are You may convey covered works to others for the sole purpose of having
prohibited by law if you do not accept this License. Therefore, by them make modifications exclusively for you, or provide you with
modifying or distributing the Program (or any work based on the facilities for running those works, provided that you comply with the
Program), you indicate your acceptance of this License to do so, and terms of this License in conveying all material for which you do not
all its terms and conditions for copying, distributing or modifying control copyright. Those thus making or running the covered works for
the Program or works based on it. 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.
6. Each time you redistribute the Program (or any work based on the Conveying under any other circumstances is permitted solely under the
Program), the recipient automatically receives a license from the conditions stated below. Sublicensing is not allowed; section 10 makes
original licensor to copy, distribute or modify the Program subject to it unnecessary.
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein. #### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
You are not responsible for enforcing compliance by third parties to
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. this License.
7. If, as a consequence of a court judgment or allegation of patent Each contributor grants you a non-exclusive, worldwide, royalty-free
infringement or for any other reason (not limited to patent issues), patent license under the contributor's essential patent claims, to
conditions are imposed on you (whether by court order, agreement or 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 otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot excuse you from the conditions of this License. If you cannot convey a
distribute so as to satisfy simultaneously your obligations under this covered work so as to satisfy simultaneously your obligations under
License and any other pertinent obligations, then as a consequence you this License and any other pertinent obligations, then as a
may not distribute the Program at all. For example, if a patent consequence you may not convey it at all. For example, if you agree to
license would not permit royalty-free redistribution of the Program by terms that obligate you to collect a royalty for further conveying
all those who receive copies directly or indirectly through you, then from those to whom you convey the Program, the only way you could
the only way you could satisfy both it and this License would be to satisfy both those terms and this License would be to refrain entirely
refrain entirely from distribution of the Program. from conveying the Program.
If any portion of this section is held invalid or unenforceable under #### 13. Use with the GNU Affero General Public License.
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any Notwithstanding any other provision of this License, you have
patents or other property right claims or to contest validity of any permission to link or combine any covered work with a work licensed
such claims; this section has the sole purpose of protecting the under version 3 of the GNU Affero General Public License into a single
integrity of the free software distribution system, which is combined work, and to convey the resulting work. The terms of this
implemented by public license practices. Many people have made License will continue to apply to the part which is the covered work,
generous contributions to the wide range of software distributed but the special requirements of the GNU Affero General Public License,
through that system in reliance on consistent application of that section 13, concerning interaction through a network will apply to the
system; it is up to the author/donor to decide if he or she is willing combination as such.
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to #### 14. Revised Versions of this License.
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in The Free Software Foundation may publish revised and/or new versions
certain countries either by patents or by copyrighted interfaces, the of the GNU General Public License from time to time. Such new versions
original copyright holder who places the Program under this License will be similar in spirit to the present version, but may differ in
may add an explicit geographical distribution limitation excluding detail to address new problems or concerns.
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions Each version is given a distinguishing version number. If the Program
of the General Public License from time to time. Such new versions will specifies that a certain numbered version of the GNU General Public
be similar in spirit to the present version, but may differ in detail to License "or any later version" applies to it, you have the option of
address new problems or concerns. 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.
Each version is given a distinguishing version number. If the Program If the Program specifies that a proxy can decide which future versions
specifies a version number of this License which applies to it and "any of the GNU General Public License can be used, that proxy's public
later version", you have the option of following the terms and conditions statement of acceptance of a version permanently authorizes you to
either of that version or of any later version published by the Free choose that version for the Program.
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free Later license versions may give you additional or different
programs whose distribution conditions are different, write to the author permissions. However, no additional obligations are imposed on any
to ask for permission. For software which is copyrighted by the Free author or copyright holder as a result of your choosing to follow a
Software Foundation, write to the Free Software Foundation; we sometimes later version.
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY #### 15. Disclaimer of Warranty.
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
REPAIR OR CORRECTION. CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING #### 16. Limitation of Liability.
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE 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.
END OF TERMS AND CONDITIONS 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.
How to Apply These Terms to Your New Programs #### 17. Interpretation of Sections 15 and 16.
If you develop a new program, and you want it to be of the greatest 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 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. 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 do so, attach the following notices to the program. It is safest to
to attach them to the start of each source file to most effectively attach them to the start of each source file to most effectively state
convey the exclusion of warranty; and each file should have at least the exclusion of warranty; and each file should have at least the
the "copyright" line and a pointer to where the full notice is found. "copyright" line and a pointer to where the full notice is found.
{description} <one line to give the program's name and a brief idea of what it does.>
Copyright (C) {year} {fullname} Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License
with this program; if not, write to the Free Software Foundation, Inc., along with this program. If not, see <http://www.gnu.org/licenses/>.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper
mail.
If the program is interactive, make it output a short notice like this If the program does terminal interaction, make it output a short
when it starts in an interactive mode: notice like this when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author <program> Copyright (C) <year> <name of author>
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate The hypothetical commands \`show w' and \`show c' should show the
parts of the General Public License. Of course, the commands you use may appropriate parts of the General Public License. Of course, your
be called something other than `show w' and `show c'; they could even be program's commands might be different; for a GUI interface, you would
mouse-clicks or menu items--whatever suits your program. use an "about box".
You should also get your employer (if you work as a programmer) or your 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 school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names: necessary. For more information on this, and how to apply and follow
the GNU GPL, see <http://www.gnu.org/licenses/>.
Yoyodyne, Inc., hereby disclaims all copyright interest in the program The GNU General Public License does not permit incorporating your
`Gnomovision' (which makes passes at compilers) written by James Hacker. program into proprietary programs. If your program is a subroutine
library, you may consider it more useful to permit linking proprietary
{signature of Ty Coon}, 1 April 1989 applications with the library. If this is what you want to do, use the
Ty Coon, President of Vice GNU Lesser General Public License instead of this License. But first,
please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
This 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.
README.md
+7 -3
View File
@@ -25,7 +25,7 @@ If you'd like to have either or both the client and the API in your project, use
<repository> <repository>
<id>git-parabot</id> <id>git-parabot</id>
<name>Parabot's Git based repo</name> <name>Parabot's Git based repo</name>
<url>https://github.com/parabot/Maven-Repository/raw/master/</url> <url>https://maven.parabot.org/</url>
</repository> </repository>
</repositories> </repositories>
@@ -33,13 +33,17 @@ If you'd like to have either or both the client and the API in your project, use
<dependency> <dependency>
<groupId>org.parabot</groupId> <groupId>org.parabot</groupId>
<artifactId>client</artifactId> <artifactId>client</artifactId>
<version>2.</version> <version>2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.parabot</groupId> <groupId>org.parabot</groupId>
<artifactId>317provider</artifactId> <artifactId>317provider</artifactId>
<version>1.0</version> <version>1.14</version>
</dependency> </dependency>
</dependencies> </dependencies>
``` ```
**For the latest versions of our dependencies, please check our examples on [the Maven Repository](https://github.com/Parabot/Maven-Repository/tree/master/examples)** **For the latest versions of our dependencies, please check our examples on [the Maven Repository](https://github.com/Parabot/Maven-Repository/tree/master/examples)**
#### Labels
Labels are created with [GHLabel](https://github.com/jimmycuadra/ghlabel), whereas the yml is located in the .github directory
deploy/clean.bat
-1
View File
@@ -1 +0,0 @@
mvn clean
deploy/deploy.bat
-5
View File
@@ -1,5 +0,0 @@
mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.artifactId} -Dversion=${project.version} -Dpackaging=jar -Dfile=../target/final/${project.build.finalName}-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.1.1 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.1.1-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.3 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.3-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.5 -Dpackaging=jar -Dfile=../target/final/Parabot-V2.5-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
deploy/package.bat
-1
View File
@@ -1 +0,0 @@
mvn package
pom.xml
+86 -29
View File
@@ -6,17 +6,18 @@
<groupId>org.parabot</groupId> <groupId>org.parabot</groupId>
<artifactId>client</artifactId> <artifactId>client</artifactId>
<version>2.5.1</version> <version>2.6.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<jdk.version>1.7</jdk.version> <jdk.version>1.7</jdk.version>
<build.version></build.version> <build.version></build.version>
<additionalparam>-Xdoclint:none</additionalparam>
</properties> </properties>
<name>Parabot client</name> <name>Parabot client</name>
<description>This is the Parabot client for all kind of RSPS'. This does not contain the API.</description> <description>The only perfect open source (Runescape private server) bot!</description>
<url>http://www.parabot.org/</url> <url>http://www.parabot.org/</url>
<licenses> <licenses>
@@ -28,6 +29,11 @@
</licenses> </licenses>
<repositories> <repositories>
<repository>
<id>parabot-maven</id>
<name>Parabot its Maven Repository</name>
<url>http://maven.parabot.org/</url>
</repository>
<repository> <repository>
<id>git-parabot</id> <id>git-parabot</id>
<name>Parabot's Git based repo</name> <name>Parabot's Git based repo</name>
@@ -36,12 +42,6 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>naga</groupId>
<artifactId>naga</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>javafx</groupId> <groupId>javafx</groupId>
<artifactId>javafx</artifactId> <artifactId>javafx</artifactId>
@@ -59,24 +59,21 @@
<version>1.1.1</version> <version>1.1.1</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>junit</groupId> <groupId>*</groupId>
<artifactId>junit</artifactId> <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.bugsnag</groupId>
<artifactId>bugsnag</artifactId>
<version>1.2.8</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.11</version> <version>4.11</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.parabot</groupId>
<artifactId>internal-api</artifactId>
<version>1.4.41</version>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -90,14 +87,6 @@
<resource> <resource>
<directory>deploy</directory> <directory>deploy</directory>
<filtering>true</filtering> <filtering>true</filtering>
<excludes>
<exclude>deploy.bat</exclude>
<exclude>package.bat</exclude>
<exclude>clean.bat</exclude>
</excludes>
<!--<includes>-->
<!--<include>deploy.bat</include>-->
<!--</includes>-->
</resource> </resource>
</resources> </resources>
@@ -123,10 +112,45 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<phase>deploy</phase>
</execution>
</executions>
<configuration>
<doctitle>${project.name} V${project.version}</doctitle>
<failOnError>false</failOnError>
<quiet>true</quiet>
<outputDirectory>${project.build.directory}/apidocs/${project.version}</outputDirectory>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.5.1</version>
<executions>
<execution>
<id>attach-descriptor</id>
<goals>
<goal>attach-descriptor</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>${version}</version> <version>2.5.3</version>
<configuration> <configuration>
<descriptorRefs> <descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef> <descriptorRef>jar-with-dependencies</descriptorRef>
@@ -139,10 +163,10 @@
<outputDirectory>${project.build.directory}/final/</outputDirectory> <outputDirectory>${project.build.directory}/final/</outputDirectory>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>make-assembly</id> <id>make-assembly</id>
<!-- bind to the packaging phase -->
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
@@ -151,5 +175,38 @@
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>2.10</version>
</extension>
</extensions>
</build> </build>
<distributionManagement>
<downloadUrl>https://maven.parabot.org/</downloadUrl>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>parabot-maven</id>
<name>Custom Maven Repository</name>
<url>ftp://maven.parabot.org</url>
<layout>default</layout>
</repository>
<site>
<id>parabot-maven</id>
<name>Frontend Parabot Maven</name>
<url>ftp://maven.parabot.org/docs/${artifactId}/</url>
</site>
</distributionManagement>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</reporting>
</project> </project>
src/main/java/org/parabot/Landing.java
+110 -122
View File
@@ -1,6 +1,6 @@
package org.parabot; package org.parabot;
import com.bugsnag.Client; import org.parabot.api.translations.TranslationHelper;
import org.parabot.core.Configuration; import org.parabot.core.Configuration;
import org.parabot.core.Core; import org.parabot.core.Core;
import org.parabot.core.Directories; import org.parabot.core.Directories;
@@ -11,7 +11,6 @@ import org.parabot.core.network.proxy.ProxyType;
import org.parabot.core.ui.BotUI; import org.parabot.core.ui.BotUI;
import org.parabot.core.ui.ServerSelector; import org.parabot.core.ui.ServerSelector;
import org.parabot.core.ui.utils.UILog; import org.parabot.core.ui.utils.UILog;
import org.parabot.environment.api.utils.JavaUtil;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -20,136 +19,125 @@ import java.io.IOException;
import java.net.URI; import java.net.URI;
/** /**
* Parabot v2.1 * Parabot v2.6
* *
* @author Everel/Parnassian/Clisprail, Paradox/JKetelaar, Matt, Dane * @author Everel, JKetelaar, Matt, Dane
* @version 2.1 * @version 2.6
* @see <a href="http://www.parabot.org">Homepage</a> * @see <a href="http://www.parabot.org">Homepage</a>
*/ */
public final class Landing { public final class Landing {
private static String username; private static String username;
private static String password; private static String password;
public static void main(String... args) throws IOException {
Core.initiateBugsnagInstance();
parseArgs(args); public static void main(String... args) throws IOException {
Core.verbose("Debug mode: " + Core.inDebugMode()); parseArgs(args);
try { Directories.validate();
Core.verbose("Setting look and feel: "
+ UIManager.getSystemLookAndFeelClassName());
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (Throwable t) {
t.printStackTrace();
}
if (!Core.inDebugMode() && !Core.isValid() && Core.hasValidation()) { Core.verbose(TranslationHelper.translate("DEBUG_MODE") + Core.inDebugMode());
UILog.log("Updates",
"Please download the newest version of Parabot at "
+ Configuration.DOWNLOAD_BOT,
JOptionPane.INFORMATION_MESSAGE);
URI uri = URI.create(Configuration.API_DOWNLOAD_BOT);
try {
Desktop.getDesktop().browse(uri);
} catch (IOException e1) {
JOptionPane.showMessageDialog(null, "Connection Error",
"Error", JOptionPane.ERROR_MESSAGE);
e1.printStackTrace();
}
return;
}
Core.verbose("Validating directories..."); try {
Directories.validate(); Core.verbose(TranslationHelper.translate("SETTING_LOOK_AND_FEEL")
Core.verbose("Validating account manager..."); + UIManager.getSystemLookAndFeelClassName());
AccountManager.validate(); UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (Throwable t) {
t.printStackTrace();
}
if (username != null && password != null) { if (!Core.inDebugMode() && Core.hasValidation() && !Core.isValid()) {
new BotUI(username, password); Core.downloadNewVersion();
username = null; return;
password = null; }
return;
}
Core.verbose("Starting login gui..."); Core.verbose(TranslationHelper.translate("VALIDATION_ACCOUNT_MANAGER"));
new BotUI(null, null); AccountManager.validate();
}
private static void parseArgs(String... args) { if (username != null && password != null) {
for (int i = 0; i < args.length; i++) { new BotUI(username, password);
final String arg = args[i].toLowerCase(); username = null;
switch (arg.toLowerCase()) { password = null;
case "-createdirs": return;
Directories.validate(); }
System.out
.println("Directories created, you can now run parabot."); Core.verbose(TranslationHelper.translate("STARTING_LOGIN_GUI"));
System.exit(0); new BotUI(null, null);
break; }
case "-debug":
Core.setDebug(true); private static void parseArgs(String... args) {
break; for (int i = 0; i < args.length; i++) {
case "-v": final String arg = args[i].toLowerCase();
case "-verbose": switch (arg.toLowerCase()) {
Core.setVerbose(true); case "-createdirs":
break; Directories.validate();
case "-server": System.out
ServerSelector.initServer = args[++i]; .println(TranslationHelper.translate(("DIRECTORIES_CREATED")));
break; System.exit(0);
case "-login": break;
username = args[++i]; case "-debug":
password = args[++i]; Core.setDebug(true);
break; break;
case "-loadlocal": case "-v":
Core.setLoadLocal(true); case "-verbose":
break; Core.setVerbose(true);
case "-dump": break;
Core.setDump(true); case "-server":
break; ServerSelector.initServer = args[++i];
case "-scriptsbin": break;
Directories.setScriptCompiledDirectory(new File(args[++i])); case "-login":
break; username = args[++i];
case "-serversbin": password = args[++i];
Directories.setServerCompiledDirectory(new File(args[++i])); break;
break; case "-loadlocal":
case "-clearcache": Core.setLoadLocal(true);
Directories.clearCache(); break;
break; case "-dump":
case "-mac": Core.setDump(true);
byte[] mac = new byte[6]; break;
String str = args[++i]; case "-scriptsbin":
if (str.toLowerCase().equals("random")) { Directories.setScriptCompiledDirectory(new File(args[++i]));
new java.util.Random().nextBytes(mac); break;
} else { case "-serversbin":
i--; Directories.setServerCompiledDirectory(new File(args[++i]));
for (int j = 0; j < 6; j++) { break;
mac[j] = Byte.parseByte(args[++i], 16); // parses a hex case "-clearcache":
// number Directories.clearCache();
} break;
} case "-mac":
NetworkInterface.setMac(mac); byte[] mac = new byte[6];
break; String str = args[++i];
case "-proxy": if (str.toLowerCase().equals("random")) {
ProxyType type = ProxyType.valueOf(args[++i].toUpperCase()); new java.util.Random().nextBytes(mac);
if (type == null) { } else {
System.err.println("Invalid proxy type:" + args[i]); i--;
System.exit(1); for (int j = 0; j < 6; j++) {
return; mac[j] = Byte.parseByte(args[++i], 16); // parses a hex
} // number
ProxySocket.setProxy(type, args[++i], }
Integer.parseInt(args[++i])); }
break; NetworkInterface.setMac(mac);
case "-auth": break;
ProxySocket.auth = true; case "-proxy":
ProxySocket.setLogin(args[++i], args[++i]); ProxyType type = ProxyType.valueOf(args[++i].toUpperCase());
break; if (type == null) {
case "-no_sec": System.err.println(TranslationHelper.translate("INVALID_PROXY_TYPE") + args[i]);
Core.disableSec(); System.exit(1);
break; return;
case "-no_validation": }
Core.disableValidation(); ProxySocket.setProxy(type, args[++i],
break; Integer.parseInt(args[++i]));
} break;
} case "-auth":
} ProxySocket.auth = true;
ProxySocket.setLogin(args[++i], args[++i]);
break;
case "-no_sec":
Core.disableSec();
break;
case "-no_validation":
Core.disableValidation();
break;
}
}
}
} }
src/main/java/org/parabot/core/Configuration.java
+4 -9
View File
@@ -7,26 +7,21 @@ import org.parabot.environment.api.utils.Version;
* *
* @author Everel * @author Everel
*/ */
public class Configuration { public class Configuration extends org.parabot.api.Configuration {
// public static final String LOGIN_SERVER = "https://www.parabot.org/community/api/login.php?username=%s&password=%s";
public static final String LOGIN_SERVER = "http://bdn.parabot.org/api/v2/users/login"; public static final String LOGIN_SERVER = "http://bdn.parabot.org/api/v2/users/login";
public static final String GET_SCRIPTS = "http://bdn.parabot.org/api/get.php?action=scripts_scripts&server="; public static final String GET_SCRIPTS = "http://bdn.parabot.org/api/get.php?action=scripts_scripts&server=";
public static final String GET_SCRIPT = "http://bdn.parabot.org/api/get.php?action=scripts_script&id="; public static final String GET_SCRIPT = "http://bdn.parabot.org/api/get.php?action=scripts_script&id=";
public static final String GET_SERVER_PROVIDERS = "http://bdn.parabot.org/api/get.php?action=server_providers"; public static final String GET_SERVER_PROVIDERS = "http://bdn.parabot.org/api/get.php?action=server_providers";
public static final String GET_SERVER_PROVIDER = "http://bdn.parabot.org/api/get.php?action=server_provider&name="; public static final String GET_SERVER_PROVIDER = "http://v3.bdn.parabot.org/api/bot/download/provider?nightly=%s";
public static final String GET_SERVER_PROVIDER_INFO = "http://bdn.parabot.org/api/get.php?action=server_information&name="; public static final String GET_SERVER_PROVIDER_INFO = "http://bdn.parabot.org/api/get.php?action=server_information&name=";
public static final String GET_SERVER_SETTINGS = "http://bdn.parabot.org/api/get.php?action=get_settings"; public static final String GET_SERVER_SETTINGS = "http://bdn.parabot.org/api/get.php?action=get_settings";
public static final String GET_BOT_VERSION = "http://bdn.parabot.org/api/v2/bot/version"; public static final String GET_BOT_VERSION = "http://bdn.parabot.org/api/v2/bot/version";
public static final String API_DOWNLOAD_BOT = "http://bdn.parabot.org/api/v2/bot/download/client/"; public static final String API_DOWNLOAD_BOT = "http://v3.bdn.parabot.org/api/bot/download/client";
public static final String DOWNLOAD_BOT = "http://bdn.parabot.org/versions/"; public static final String DOWNLOAD_BOT = "http://bdn.parabot.org/versions/";
public static final String REGISTRATION_PAGE = "https://www.parabot.org/community/register/"; public static final String REGISTRATION_PAGE = "https://www.parabot.org/community/register/";
public static final String GET_RANDOMS = "http://bdn.parabot.org/api/get.php?action=randoms"; public static final String GET_RANDOMS = "http://v3.bdn.parabot.org/api/bot/download/randoms";
public static final String DATA_API = "http://bdn.parabot.org/api/v2/data/"; public static final String DATA_API = "http://bdn.parabot.org/api/v2/data/";
public static final String ITEM_API = DATA_API + "items/"; public static final String ITEM_API = DATA_API + "items/";
public static final String BUGSNAG_API = "d79752cf94dd4beb24c3d312a8609f53";
public static final Version BOT_VERSION = ProjectProperties.getProjectVersion(); public static final Version BOT_VERSION = ProjectProperties.getProjectVersion();
public static final String BOT_TITLE = "Parabot";
public static final String BOT_SLOGAN = "The best RuneScape private server bot";
} }
src/main/java/org/parabot/core/Context.java
+23 -22
View File
@@ -1,6 +1,7 @@
package org.parabot.core; package org.parabot.core;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;
import org.parabot.api.translations.TranslationHelper;
import org.parabot.core.asm.ASMClassLoader; import org.parabot.core.asm.ASMClassLoader;
import org.parabot.core.classpath.ClassPath; import org.parabot.core.classpath.ClassPath;
import org.parabot.core.desc.ServerProviderInfo; import org.parabot.core.desc.ServerProviderInfo;
@@ -9,12 +10,12 @@ import org.parabot.core.parsers.hooks.HookParser;
import org.parabot.core.ui.BotDialog; import org.parabot.core.ui.BotDialog;
import org.parabot.core.ui.BotUI; import org.parabot.core.ui.BotUI;
import org.parabot.core.ui.components.GamePanel; import org.parabot.core.ui.components.GamePanel;
import org.parabot.core.ui.listeners.PBKeyListener;
import org.parabot.environment.api.interfaces.Paintable; import org.parabot.environment.api.interfaces.Paintable;
import org.parabot.environment.input.Keyboard; import org.parabot.environment.input.Keyboard;
import org.parabot.environment.input.Mouse; import org.parabot.environment.input.Mouse;
import org.parabot.environment.scripts.Script; import org.parabot.environment.scripts.Script;
import org.parabot.environment.scripts.randoms.RandomHandler; import org.parabot.environment.scripts.randoms.RandomHandler;
import org.parabot.environment.scripts.uliratha.UlirathaClient;
import org.parabot.environment.servers.ServerProvider; import org.parabot.environment.servers.ServerProvider;
import java.applet.Applet; import java.applet.Applet;
@@ -48,8 +49,8 @@ public class Context {
private PaintDebugger paintDebugger; private PaintDebugger paintDebugger;
private Mouse mouse; private Mouse mouse;
private Keyboard keyboard; private Keyboard keyboard;
private PBKeyListener pbKeyListener;
private ServerProviderInfo providerInfo; private ServerProviderInfo providerInfo;
private UlirathaClient ulirathaClient;
private JSONParser jsonParser; private JSONParser jsonParser;
private PrintStream defaultOut; private PrintStream defaultOut;
@@ -164,18 +165,18 @@ public class Context {
*/ */
public void load() { public void load() {
BotUI.getInstance().getJMenuBar().remove(2); BotUI.getInstance().getJMenuBar().remove(2);
Core.verbose("Parsing server jar..."); Core.verbose(TranslationHelper.translate("PARSING_SERVER_JAR"));
serverProvider.init(); serverProvider.init();
serverProvider.parseJar(); serverProvider.parseJar();
Core.verbose("Done."); Core.verbose(TranslationHelper.translate("DONE"));
Core.verbose("Injecting hooks..."); Core.verbose(TranslationHelper.translate("INJECTING_HOOKS"));
serverProvider.injectHooks(); serverProvider.injectHooks();
Core.verbose("Done."); Core.verbose(TranslationHelper.translate("DONE"));
Core.verbose("Fetching game applet..."); Core.verbose(TranslationHelper.translate("FETCHING_GAME_APPLET"));
if(Core.shouldDump()) { if(Core.shouldDump()) {
Core.verbose("Dumping injected client..."); Core.verbose(TranslationHelper.translate("DUMPING_INJECTED_CLIENT"));
classPath.dump(new File(Directories.getWorkspace(), "dump.jar")); classPath.dump(new File(Directories.getWorkspace(), "dump.jar"));
Core.verbose("Done."); Core.verbose(TranslationHelper.translate("DONE"));
} }
Applet applet = serverProvider.fetchApplet(); Applet applet = serverProvider.fetchApplet();
// if applet is null the server provider will call setApplet itself // if applet is null the server provider will call setApplet itself
@@ -195,7 +196,7 @@ public class Context {
setClientInstance(gameApplet); setClientInstance(gameApplet);
} }
Core.verbose("Applet fetched."); Core.verbose(TranslationHelper.translate("APPLET_FETCHED"));
final GamePanel panel = GamePanel.getInstance(); final GamePanel panel = GamePanel.getInstance();
final Dimension appletSize = serverProvider.getGameDimensions(); final Dimension appletSize = serverProvider.getGameDimensions();
@@ -221,12 +222,16 @@ public class Context {
} }
}, 1000); }, 1000);
Core.verbose("Initializing mouse..."); Core.verbose(TranslationHelper.translate("INIT_MOUSE"));
serverProvider.initMouse(); serverProvider.initMouse();
Core.verbose("Done."); Core.verbose(TranslationHelper.translate("DONE"));
Core.verbose("Initializing keyboard..."); Core.verbose(TranslationHelper.translate("INIT_KEYBOARD"));
serverProvider.initKeyboard(); serverProvider.initKeyboard();
Core.verbose("Done."); Core.verbose(TranslationHelper.translate("DONE"));
Core.verbose(TranslationHelper.translate("INIT_KEY_LISTENER"));
this.pbKeyListener = new PBKeyListener();
applet.addKeyListener(this.pbKeyListener);
BotDialog.getInstance().validate(); BotDialog.getInstance().validate();
System.setOut(this.defaultOut); System.setOut(this.defaultOut);
@@ -354,14 +359,6 @@ public class Context {
return username; return username;
} }
public UlirathaClient getUlirathaClient() {
return ulirathaClient;
}
public void setUlirathaClient(UlirathaClient ulirathaClient) {
this.ulirathaClient = ulirathaClient;
}
public static void setUsername(String username) { public static void setUsername(String username) {
Context.username = username; Context.username = username;
} }
@@ -369,4 +366,8 @@ public class Context {
public JSONParser getJsonParser() { public JSONParser getJsonParser() {
return jsonParser; return jsonParser;
} }
public PBKeyListener getPbKeyListener() {
return pbKeyListener;
}
} }
src/main/java/org/parabot/core/Core.java
+63 -118
View File
@@ -1,20 +1,21 @@
package org.parabot.core; package org.parabot.core;
import com.bugsnag.BeforeNotify;
import com.bugsnag.Client;
import com.bugsnag.Error;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.parser.ParseException; import org.json.simple.parser.ParseException;
import org.parabot.Landing; import org.parabot.Landing;
import org.parabot.api.translations.TranslationHelper;
import org.parabot.core.ui.utils.UILog; import org.parabot.core.ui.utils.UILog;
import org.parabot.environment.api.utils.Version; import org.parabot.environment.api.utils.Version;
import org.parabot.environment.api.utils.WebUtil; import org.parabot.environment.api.utils.WebUtil;
import javax.swing.*;
import java.awt.*;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.security.MessageDigest; import java.security.MessageDigest;
@@ -27,7 +28,7 @@ import java.security.NoSuchAlgorithmException;
*/ */
@SuppressWarnings("Duplicates") @SuppressWarnings("Duplicates")
public class Core { public class Core {
public static boolean mDebug;
private static boolean debug; private static boolean debug;
private static boolean verbose; private static boolean verbose;
private static boolean dump; private static boolean dump;
@@ -37,9 +38,6 @@ public class Core {
private static boolean secure = true; private static boolean secure = true;
private static Version currentVersion = Configuration.BOT_VERSION; private static Version currentVersion = Configuration.BOT_VERSION;
private static Version latestVersion;
private static Client bugsnagInstance;
public static void disableValidation() { public static void disableValidation() {
Core.validate = false; Core.validate = false;
@@ -80,21 +78,21 @@ public class Core {
* @param dump * @param dump
*/ */
public static void setDump(final boolean dump) { public static void setDump(final boolean dump) {
Core.dump = dump; Core.dump = dump;
} }
public static void disableSec(){ public static void disableSec() {
UILog.log( UILog.log(
"Security Warning", "Security Warning",
"Disabling the securty manager is ill advised.\n" "Disabling the securty manager is ill advised.\n"
+ " Only do so if the client fails to load, or functions incorrectly (freezes,crashes, etc.)\n" + " Only do so if the client fails to load, or functions incorrectly (freezes,crashes, etc.)\n"
+ "The security manager protects you from malicous code within the client, without it you are exposed!\n" + "The security manager protects you from malicous code within the client, without it you are exposed!\n"
+ "\nPlease contact Parabot staff to resolve whatever problem you are having!"); + "\nPlease contact Parabot staff to resolve whatever problem you are having!");
Core.secure = false; Core.secure = false;
} }
public static boolean isSecure(){ public static boolean isSecure() {
return secure; return secure;
} }
/** /**
@@ -115,7 +113,7 @@ public class Core {
* @return if parabot should dump injected jar * @return if parabot should dump injected jar
*/ */
public static boolean shouldDump() { public static boolean shouldDump() {
return dump; return dump;
} }
/** /**
@@ -135,9 +133,10 @@ public class Core {
/** /**
* Checks the version of the bot using a checksum of the jar comparison against checksum given by the website * Checks the version of the bot using a checksum of the jar comparison against checksum given by the website
*
* @return <b>true</b> if no new version is found, otherwise <b>false</b>. * @return <b>true</b> if no new version is found, otherwise <b>false</b>.
*/ */
private static boolean checksumValid(){ private static boolean checksumValid() {
File f = new File(Landing.class.getProtectionDomain().getCodeSource().getLocation().getFile()); File f = new File(Landing.class.getProtectionDomain().getCodeSource().getLocation().getFile());
if (f.isFile()) { if (f.isFile()) {
try { try {
@@ -156,18 +155,14 @@ public class Core {
byte[] mdbytes = md.digest(); byte[] mdbytes = md.digest();
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
for (int i = 0; i < mdbytes.length; i++) { for (byte mdbyte : mdbytes) {
sb.append(Integer.toString((mdbytes[i] & 0xff) + 0x100, 16).substring(1)); sb.append(Integer.toString((mdbyte & 0xff) + 0x100, 16).substring(1));
} }
String result; String result;
if ((result = WebUtil.getContents("http://bdn.parabot.org/api/v2/bot/checksum", "checksum=" + URLEncoder.encode(sb.toString(), "UTF-8"))) != null) { if ((result = WebUtil.getContents(String.format(Configuration.COMPARE_CHECKSUM_URL, "client", currentVersion.get()), "checksum=" + URLEncoder.encode(sb.toString(), "UTF-8"))) != null) {
JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(result); JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(result);
if (!(boolean) object.get("result")){ return (boolean) object.get("result");
Core.verbose("Latest checksum: " + sb.toString());
Core.verbose("Latest checksum: " + object.get("current"));
return false;
}
} }
} }
} catch (NoSuchAlgorithmException | ParseException | IOException | URISyntaxException e) { } catch (NoSuchAlgorithmException | ParseException | IOException | URISyntaxException e) {
@@ -177,64 +172,25 @@ public class Core {
return true; return true;
} }
/**
* @Deprecated use #validVersion instead
*
* Checks the version of the bot using a variable comparison from the bot code and the Parabot website
*
* @return <b>true</b> if no new version is found, otherwise <b>false</b>.
*/
private static boolean versionValid(){
BufferedReader br = WebUtil.getReader(Configuration.GET_BOT_VERSION);
try {
String version = null;
if (br != null) {
JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(br);
version = (String) object.get("result");
}
if (version != null) {
if (!Configuration.BOT_VERSION.equals(version)) {
Core.verbose("Our version: " + Configuration.BOT_VERSION);
Core.verbose("Latest version: " + version);
return false;
}
}
} catch (NumberFormatException | IOException | ParseException e) {
e.printStackTrace();
} finally {
try {
if (br != null) {
br.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}
return true;
}
/** /**
* Compares the latest version from the BDN and the current version * Compares the latest version from the BDN and the current version
* *
* @return True if the current version is equal or higher than the latest version, false if lower than the latest version * @return True if the current version is equal or higher than the latest version, false if lower than the latest version
*/ */
public static boolean validVersion() { public static boolean validVersion() {
BufferedReader br = WebUtil.getReader(Configuration.GET_BOT_VERSION); String url = String.format(Configuration.COMPARE_VERSION_URL, "client", currentVersion.get());
BufferedReader br = WebUtil.getReader(url);
try { try {
latestVersion = null;
if (br != null) { if (br != null) {
JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(br); JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(br);
latestVersion = new Version((String) object.get("result")); boolean latest = (Boolean) object.get("result");
} if (!latest) {
if (latestVersion != null) { Directories.clearCache();
if (Configuration.BOT_VERSION.compareTo(latestVersion) < 0) {
Core.verbose("Our version: " + Configuration.BOT_VERSION.get());
Core.verbose("Latest version: " + latestVersion.get());
return false;
} }
return latest;
} }
} catch (NumberFormatException | IOException | ParseException e) { } catch (IOException | ParseException e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
@@ -252,13 +208,13 @@ public class Core {
/** /**
* Validates the cache and removes the cache contents if required * Validates the cache and removes the cache contents if required
*/ */
private static void validateCache(){ private static void validateCache() {
File[] cache = Directories.getCachePath().listFiles(); File[] cache = Directories.getCachePath().listFiles();
Integer lowest = null; Integer lowest = null;
if (cache != null) { if (cache != null) {
for (File f : cache) { for (File f : cache) {
int date = (int) (f.lastModified()/ 1000); int date = (int) (f.lastModified() / 1000);
if (lowest == null || date < lowest){ if (lowest == null || date < lowest) {
lowest = date; lowest = date;
} }
} }
@@ -266,10 +222,10 @@ public class Core {
try { try {
JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(WebUtil.getContents("http://bdn.parabot.org/api/v2/bot/cache", "date=" + lowest)); JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(WebUtil.getContents("http://bdn.parabot.org/api/v2/bot/cache", "date=" + lowest));
if ((boolean) object.get("result")){ if ((boolean) object.get("result")) {
Core.verbose("Making space for the latest cache files"); Core.verbose("Making space for the latest cache files");
Directories.clearCache(); Directories.clearCache();
}else{ } else {
Core.verbose("Cache is up to date"); Core.verbose("Cache is up to date");
} }
} catch (MalformedURLException | ParseException e) { } catch (MalformedURLException | ParseException e) {
@@ -277,6 +233,21 @@ public class Core {
} }
} }
public static void downloadNewVersion() {
UILog.log(TranslationHelper.translate("UPDATES"),
TranslationHelper.translate("DOWNLOAD_UPDATE_PARABOT_AT")
+ Configuration.DOWNLOAD_BOT + (currentVersion.isNightly() ? Configuration.NIGHTLY_APPEND : ""),
JOptionPane.INFORMATION_MESSAGE);
URI uri = URI.create(Configuration.API_DOWNLOAD_BOT + (currentVersion.isNightly() ? Configuration.NIGHTLY_APPEND : ""));
try {
Desktop.getDesktop().browse(uri);
} catch (IOException e1) {
JOptionPane.showMessageDialog(null, TranslationHelper.translate("CONNECTION_ERROR"),
TranslationHelper.translate("ERROR"), JOptionPane.ERROR_MESSAGE);
e1.printStackTrace();
}
}
/** /**
* Checks for updates. * Checks for updates.
* *
@@ -286,43 +257,17 @@ public class Core {
Core.verbose("Checking for updates..."); Core.verbose("Checking for updates...");
validateCache(); validateCache();
setBugsnagVersion(); if (validate) {
if (validVersion() && checksumValid()) {
if ((validVersion() && checksumValid()) || (!checksumValid() && currentVersion.compareTo(latestVersion) >= 0)){ Core.verbose("No updates available.");
Core.verbose("No updates available."); return true;
} else {
Core.verbose("Updates available...");
return false;
}
} else {
Core.verbose("Validation disabled");
return true; return true;
}else{
Core.verbose("Updates available...");
return false;
} }
} }
public static void initiateBugsnagInstance() {
bugsnagInstance = new Client(Configuration.BUGSNAG_API);
bugsnagInstance.setSendThreads(true);
}
public static void setBugsnagVersion(){
Core.bugsnagInstance.setReleaseStage(currentVersion != latestVersion ? "development" : "production");
}
public static void setBugsnagUser(String id, String email, String username){
// TODO Check order of parameters
Core.bugsnagInstance.setUser(username, email, id);
}
public static void setBugsnagServer(String server){
Core.setBugsnagInformation("Server", "Server", server);
}
public static void setBugsnagInformation(String tab, String key, String value){
// TODO Should be checked if correct
Core.bugsnagInstance.addToTab(tab, key, value);
}
public static void debug(int i) {
if(mDebug) {
System.out.println("DEBUG: " + i);
}
}
} }
src/main/java/org/parabot/core/Directories.java
+2 -327
View File
@@ -1,15 +1,5 @@
package org.parabot.core; package org.parabot.core;
import org.json.simple.JSONObject;
import org.json.simple.parser.ParseException;
import org.parabot.environment.OperatingSystem;
import org.parabot.environment.api.utils.StringUtils;
import org.parabot.environment.api.utils.WebUtil;
import javax.swing.*;
import java.io.*;
import java.util.*;
/** /**
* Holds and manages Parabot's used directories * Holds and manages Parabot's used directories
* *
@@ -17,321 +7,6 @@ import java.util.*;
* @author JKetelaar * @author JKetelaar
* @author Matt * @author Matt
*/ */
public class Directories { public class Directories extends org.parabot.api.io.Directories {
private static Map<String, File> cached;
private static String tempDir;
static { }
cached = new HashMap<>();
switch (OperatingSystem.getOS()) {
case WINDOWS:
cached.put("Root", new JFileChooser().getFileSystemView().getDefaultDirectory());
break;
default:
cached.put("Root", new File(System.getProperty("user.home")));
}
Core.verbose("Caching directories...");
cached.put("Root", getDefaultDirectory());
cached.put("Workspace", new File(cached.get("Root"), "/Parabot/"));
cached.put("Sources", new File(cached.get("Root"), "/Parabot/scripts/sources/"));
cached.put("Compiled", new File(cached.get("Root"), "/Parabot/scripts/compiled/"));
cached.put("Resources", new File(cached.get("Root"), "/Parabot/scripts/resources/"));
cached.put("Settings", new File(cached.get("Root"), "/Parabot/settings/"));
cached.put("Servers", new File(cached.get("Root"), "/Parabot/servers/"));
cached.put("Cache", new File(cached.get("Root"), "/Parabot/cache/"));
cached.put("Screenshots", new File(cached.get("Root"), "/Parabot/screenshots/"));
Core.verbose("Directories cached.");
clearCache(259200);
if (Core.isSecure()) {
setHomeDirectory();
}
}
private static void setHomeDirectory(){
File cache;
tempDir = StringUtils.randomString(12);
try {
if ((cache = new File(Directories.getSettingsPath(), "cache.json")).exists()){
JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(new FileReader(cache));
String temp;
if ((temp = (String) object.get("homedir")) != null){
cached.put("Home", new File(cached.get("Root"), "/" + temp + "/"));
}
}else{
cached.put("Home", createCacheDirectory(cache));
}
} catch (IOException | ParseException ignored) {
cached.put("Home", new File(cached.get("Root"), "/" + tempDir + "/"));
}
if (!cached.get("Home").exists()) {
cached.get("Home").mkdirs();
}
System.out.println("Set temporary cache directory to: " + cached.get("Home"));
}
private static File createCacheDirectory(File cacheFile) throws IOException {
cacheFile.createNewFile();
JSONObject object = new JSONObject();
object.put("homedir", tempDir);
FileWriter file = new FileWriter(cacheFile);
file.write(object.toJSONString());
file.flush();
file.close();
File cacheDir = new File(cached.get("Root"), "/" + tempDir + "/");
if (!cacheDir.exists()) {
cacheDir.mkdirs();
}
return cacheDir;
}
/**
* Set script bin folder
*
* @param f
*/
public static void setScriptCompiledDirectory(File f) {
if (!f.isDirectory()) {
throw new IllegalArgumentException(f + "is not a directory.");
}
cached.put("Compiled", f);
}
/**
* Set server bin folder
*
* @param f
*/
public static void setServerCompiledDirectory(File f) {
if (!f.isDirectory()) {
throw new IllegalArgumentException(f + "is not a directory.");
}
cached.put("Servers", f);
}
/**
* Returns the root directory outside of the main Parabot folder.
*
* @return
*/
public static File getDefaultDirectory() {
return cached.get("Root");
}
/**
* Returns the Parabot folder.
*
* @return
*/
public static File getWorkspace() {
return cached.get("Workspace");
}
/**
* Returns the script sources folder.
*
* @return
*/
public static File getScriptSourcesPath() {
return cached.get("Sources");
}
/**
* Returns the compiled scripts folder.
*
* @return
*/
public static File getScriptCompiledPath() {
return cached.get("Compiled");
}
/**
* Returns the scripts resources folder.
*
* @return
*/
public static File getResourcesPath() {
return cached.get("Resources");
}
/**
* Returns the Parabot settings folder.
*
* @return
*/
public static File getSettingsPath() {
return cached.get("Settings");
}
/**
* Returns the Parabot servers folder.
*
* @return
*/
public static File getServerPath() {
return cached.get("Servers");
}
/**
* Returns the Parabot cache folder.
*
* @return
*/
public static File getCachePath() {
return cached.get("Cache");
}
/**
* Returns the redirected Home Directory
* @return
*/
public static File getHomeDir() {
return cached.get("Home");
}
/**
* Returns the screenshot folder.
*
* @return
*/
public static File getScreenshotDir() {
return cached.get("Screenshots");
}
/**
* Validates all directories and makes them if necessary
*/
public static void validate() {
final File defaultPath = getDefaultDirectory();
if (defaultPath == null || !defaultPath.exists()) {
throw new RuntimeException("Default path not found");
}
final Queue<File> files = new LinkedList<File>();
files.addAll(cached.values());
while (files.size() > 0) {
final File file = files.poll();
if (!file.exists()) {
Core.verbose("Generating directory: " + file.getAbsolutePath());
file.mkdirs();
if (!file.exists()) {
System.err.println("Failed to make directory: " + file.getAbsolutePath());
}
}
}
}
private static File temp = null;
public static File getTempDirectory() {
if (temp != null) {
return temp;
}
int randomNum = new Random().nextInt(999999999);
temp = new File(getResourcesPath(), randomNum + "/");
temp.mkdirs();
temp.deleteOnExit();
return temp;
}
/**
* Clears the cache based on the latest modification
*
* @param remove A long that represents the amount of seconds that a file may have since the latest modification
* @param force Defines if the cache folder, within user.home, should also be removed
*/
public static void clearCache(int remove, boolean force){
File[] cache = getCachePath().listFiles();
if (cache != null) {
for (File f : cache) {
if (f != null && System.currentTimeMillis() / 1000 - f.lastModified() / 1000 > remove) {
Core.verbose("Clearing " + f.getName() + " from cache...");
f.delete();
}
}
}
if (force){
File cacheFile;
if ((cacheFile = new File(Directories.getSettingsPath(), "cache.json")).exists()){
try {
JSONObject jsonObject = (JSONObject) WebUtil.getJsonParser().parse(new FileReader(cacheFile));
if (jsonObject != null){
Object dirObject;
if ((dirObject = jsonObject.get("homedir")) != null) {
String dir = (String) dirObject;
if (dir.length() > 0) {
File cacheDir = new File(cached.get("Root"), "/" + dir + "/");
removeDirectory(cacheDir);
createCacheDirectory(cacheFile);
}
}
}
} catch (IOException | ParseException e) {
e.printStackTrace();
}
}
}
}
private static void clearCache(int remove) {
clearCache(remove, false);
}
public static void clearCache() {
clearCache(0, true);
}
/**
* @param file Directory to be removed
*/
private static void removeDirectory(File file) {
if (file.isDirectory()) {
if (file.list().length == 0) {
file.delete();
Core.verbose("Directory is deleted : "
+ file.getAbsolutePath());
} else {
String files[] = file.list();
for (String temp : files) {
File fileDelete = new File(file, temp);
removeDirectory(fileDelete);
}
if (file.list().length == 0) {
file.delete();
Core.verbose("Directory is deleted : "
+ file.getAbsolutePath());
}
}
} else {
file.delete();
Core.verbose("File is deleted : " + file.getAbsolutePath());
}
}
/**
* Returns an array of files with from a given directory and a given extension
*
* @param directory The directory where should be searched
* @param extension The extension to be searched for, including the dot (like .json)
* @return An array of of files that match the request
*/
public static File[] listFilesWithExtension(File directory, final String extension){
return directory.listFiles(new FilenameFilter() {
public boolean accept(File dir, String filename) {
return filename.endsWith(extension);
}
});
}
public static File[] listJSONFiles(File directory) {
return listFilesWithExtension(directory, ".json");
}
}
src/main/java/org/parabot/core/ProjectProperties.java
+1 -1
View File
@@ -21,7 +21,7 @@ public class ProjectProperties {
private void setProperties() { private void setProperties() {
InputStream input; InputStream input;
try { try {
String propertiesFileName = "storage/app.properties"; String propertiesFileName = "storage/parabot.properties";
input = getClass().getClassLoader() input = getClass().getClassLoader()
.getResourceAsStream(propertiesFileName); .getResourceAsStream(propertiesFileName);
src/main/java/org/parabot/core/asm/wrappers/Getter.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class Getter implements Injectable {
* *
* @param into - classnode to inject getter method in * @param into - classnode to inject getter method in
* @param fieldLocation - classnode where field is located * @param fieldLocation - classnode where field is located
* @param fieldName - field name to get * @param fieldNode - field name to get
* @param methodName - method name of getter * @param methodName - method name of getter
* @param returnDesc - return type of method, can be null for default return * @param returnDesc - return type of method, can be null for default return
* @param staticMethod - pass true if you want the method to be static * @param staticMethod - pass true if you want the method to be static
src/main/java/org/parabot/core/classpath/ClassPath.java
+5 -6
View File
@@ -32,7 +32,6 @@ import org.parabot.core.io.SizeInputStream;
import org.parabot.core.ui.components.VerboseLoader; import org.parabot.core.ui.components.VerboseLoader;
/** /**
*
* Manages, parses and dumps class files & jars * Manages, parses and dumps class files & jars
* *
* @author Everel * @author Everel
@@ -83,7 +82,7 @@ public class ClassPath {
/** /**
* Adds a jar to this classpath * Adds a jar to this classpath
* *
* @param url * @param connection
*/ */
public void addJar(final URLConnection connection) { public void addJar(final URLConnection connection) {
try { try {
@@ -148,7 +147,7 @@ public class ClassPath {
/** /**
* Finds and loads all classes/jar files in folder * Finds and loads all classes/jar files in folder
* *
* @param file * @param f
* to find class / jar files * to find class / jar files
* @param root * @param root
*/ */
@@ -191,10 +190,10 @@ public class ClassPath {
/** /**
* Loads class from input stream * Loads class from input stream
* *
* @param inputstream * @param in
* @throws IOException * @throws IOException
*/ */
protected void loadClass(InputStream in) throws IOException { protected void loadClass(InputStream in) throws IOException {
ClassReader cr = new ClassReader(in); ClassReader cr = new ClassReader(in);
ClassNode cn = new ClassNode(); ClassNode cn = new ClassNode();
src/main/java/org/parabot/core/forum/Account.java
-2
View File
@@ -33,8 +33,6 @@ public class Account {
this.username = username; this.username = username;
this.password = password; this.password = password;
this.api = api; this.api = api;
Core.setBugsnagUser("Null", this.username, "Null");
} }
/** /**
src/main/java/org/parabot/core/io/NoProgressListener.java
+16
View File
@@ -0,0 +1,16 @@
package org.parabot.core.io;
/**
* @author JKetelaar
*/
public class NoProgressListener implements ProgressListener {
@Override
public void onProgressUpdate(double value) {
}
@Override
public void updateDownloadSpeed(double mbPerSecond) {
}
}
src/main/java/org/parabot/core/io/ProgressListener.java
+1 -13
View File
@@ -7,18 +7,6 @@ package org.parabot.core.io;
* @author Everel * @author Everel
* *
*/ */
public interface ProgressListener { public interface ProgressListener extends org.parabot.api.io.ProgressListener{
/**
* Called when progress increased
* @param value
*/
public void onProgressUpdate(double value);
/**
* Updates upload speed
* @param mbPerSecond
*/
public void updateDownloadSpeed(double mbPerSecond);
} }
src/main/java/org/parabot/core/lib/naga/Naga.java
-72
View File
@@ -1,72 +0,0 @@
package org.parabot.core.lib.naga;
import org.parabot.core.Core;
import org.parabot.core.Directories;
import org.parabot.core.build.BuildPath;
import org.parabot.core.lib.Library;
import java.io.File;
import java.net.URL;
/**
* @author JKetelaar
*/
public class Naga extends Library {
private static boolean valid;
@Override
public void init() {
if (!hasJar()) {
System.err.println("Failed to load javafx... [jar missing]");
return;
}
Core.verbose("Adding javafx jar file to build path: "
+ getJarFileURL().getPath());
BuildPath.add(getJarFileURL());
try {
Class.forName("javafx.application.Application");
valid = true;
} catch (ClassNotFoundException e) {
System.err
.println("Failed to add javafx to build path, or incorrupt download");
}
Core.verbose("JavaFX initialized.");
}
@Override
public boolean isAdded() {
return valid;
}
@Override
public File getJarFile() {
return new File(Directories.getCachePath(), "naga.jar");
}
@Override
public URL getDownloadLink() {
try {
return new URL("http://bdn.parabot.org/api/v2/data/dependencies/naga");
} catch (Throwable t) {
t.printStackTrace();
}
return null;
}
@Override
public boolean requiresJar() {
return true;
}
@Override
public String getLibraryName() {
return "Naga";
}
public static boolean isValid() {
return valid;
}
}
src/main/java/org/parabot/core/paint/AbstractDebugger.java
+4 -4
View File
@@ -15,11 +15,11 @@ public abstract class AbstractDebugger implements Paintable {
* Toggles this debugger * Toggles this debugger
*/ */
public abstract void toggle(); public abstract void toggle();
/** /**
* *
* @return <b>true</b> if this debugger is enabled, otherwise <b>false</b> * @return True if this debugger is enabled, otherwise false
*/ */
public abstract boolean isEnabled(); public abstract boolean isEnabled();
} }
src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java
+8 -14
View File
@@ -1,11 +1,11 @@
package org.parabot.core.parsers.randoms; package org.parabot.core.parsers.randoms;
import org.parabot.api.io.WebUtil;
import org.parabot.core.Configuration; import org.parabot.core.Configuration;
import org.parabot.core.Context; import org.parabot.core.Context;
import org.parabot.core.Core; import org.parabot.core.Core;
import org.parabot.core.Directories; import org.parabot.core.Directories;
import org.parabot.core.io.ProgressListener; import org.parabot.core.io.NoProgressListener;
import org.parabot.environment.api.utils.WebUtil;
import java.io.File; import java.io.File;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@@ -19,9 +19,11 @@ import java.net.URLClassLoader;
*/ */
public class PublicRandoms extends RandomParser { public class PublicRandoms extends RandomParser {
private String fileName = ((Configuration.BOT_VERSION.isNightly()) ? "randoms-nightly.jar" : "randoms.jar");
@Override @Override
public void parse() { public void parse() {
File myJar = new File(Directories.getCachePath() + "/randoms.jar"); File myJar = new File(Directories.getCachePath() + File.separator + fileName);
if (!myJar.exists() || !myJar.canRead()) { if (!myJar.exists() || !myJar.canRead()) {
download(); download();
} }
@@ -45,23 +47,15 @@ public class PublicRandoms extends RandomParser {
private void download() { private void download() {
try { try {
File random = new File(Directories.getCachePath() + "/randoms.jar"); File random = new File(Directories.getCachePath() + File.separator + fileName);
if (random.exists()) { if (random.exists()) {
Core.verbose("Public random dependency already exists, no need to download it..."); Core.verbose("Public random dependency already exists, no need to download it...");
return; return;
} }
String downloadLink = Configuration.GET_RANDOMS;
WebUtil.downloadFile(new URL(downloadLink), random, new ProgressListener() {
@Override
public void onProgressUpdate(double v) {
} String downloadLink = ((Configuration.BOT_VERSION.isNightly()) ? Configuration.GET_RANDOMS + Configuration.NIGHTLY_APPEND : Configuration.GET_RANDOMS);
@Override WebUtil.downloadFile(new URL(downloadLink), random, new NoProgressListener());
public void updateDownloadSpeed(double v) {
}
});
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
src/main/java/org/parabot/core/ui/BotUI.java
+24 -12
View File
@@ -1,10 +1,12 @@
package org.parabot.core.ui; package org.parabot.core.ui;
import org.parabot.core.Configuration;
import org.parabot.core.Context; import org.parabot.core.Context;
import org.parabot.core.Directories; import org.parabot.core.Directories;
import org.parabot.core.ui.components.GamePanel; import org.parabot.core.ui.components.GamePanel;
import org.parabot.core.ui.components.VerboseLoader; import org.parabot.core.ui.components.VerboseLoader;
import org.parabot.core.ui.images.Images; import org.parabot.core.ui.images.Images;
import org.parabot.core.ui.listeners.PBKeyListener;
import org.parabot.core.ui.utils.SwingUtil; import org.parabot.core.ui.utils.SwingUtil;
import org.parabot.environment.OperatingSystem; import org.parabot.environment.OperatingSystem;
import org.parabot.environment.api.utils.StringUtils; import org.parabot.environment.api.utils.StringUtils;
@@ -23,7 +25,7 @@ import java.util.ArrayList;
/** /**
* The bot user interface * The bot user interface
* *
* @author Dane, Everel, Paradox * @author Dane, Everel, JKetelaar
*/ */
public class BotUI extends JFrame implements ActionListener, ComponentListener, WindowListener { public class BotUI extends JFrame implements ActionListener, ComponentListener, WindowListener {
@@ -31,7 +33,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
private static BotUI instance; private static BotUI instance;
private static JDialog dialog; private static JDialog dialog;
private JMenuItem run, pause, stop, cacheClear; private JMenuItem run, pause, stop;
private boolean runScript, pauseScript; private boolean runScript, pauseScript;
public BotUI(String username, String password) { public BotUI(String username, String password) {
@@ -39,10 +41,9 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
throw new IllegalStateException("BotUI already created"); throw new IllegalStateException("BotUI already created");
} }
instance = this; instance = this;
//WebLookAndFeel.install();
JPopupMenu.setDefaultLightWeightPopupEnabled(false); JPopupMenu.setDefaultLightWeightPopupEnabled(false);
setTitle("Parabot"); setTitle(Configuration.BOT_TITLE);
setResizable(false); setResizable(false);
setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
createMenu(); createMenu();
@@ -102,7 +103,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
stop.setEnabled(false); stop.setEnabled(false);
stop.setIcon(new ImageIcon(Images.getResource("/storage/images/stop.png"))); stop.setIcon(new ImageIcon(Images.getResource("/storage/images/stop.png")));
cacheClear = new JMenuItem("Clear cache"); JMenuItem cacheClear = new JMenuItem("Clear cache");
cacheClear.setIcon(new ImageIcon(Images.getResource("/storage/images/trash.png"))); cacheClear.setIcon(new ImageIcon(Images.getResource("/storage/images/trash.png")));
screenshot.addActionListener(this); screenshot.addActionListener(this);
@@ -142,8 +143,10 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
String command = e.getActionCommand(); this.performCommand(e.getActionCommand());
}
public void performCommand(String command) {
switch (command) { switch (command) {
case "Create screenshot": case "Create screenshot":
try { try {
@@ -153,11 +156,14 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
String randString = StringUtils.randomString(10); String randString = StringUtils.randomString(10);
boolean search = true; boolean search = true;
boolean duplicate = false; boolean duplicate = false;
while (search == true) { while (search) {
for (File f : Directories.getScreenshotDir().listFiles()) { File[] files;
if (f.getAbsoluteFile().getName().contains(randString)) { if ((files = Directories.getScreenshotDir().listFiles()) != null) {
duplicate = true; for (File f : files) {
break; if (f.getAbsoluteFile().getName().contains(randString)) {
duplicate = true;
break;
}
} }
} }
if (!duplicate) { if (!duplicate) {
@@ -207,6 +213,12 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
pauseScript = true; pauseScript = true;
break; break;
case "Stop": case "Stop":
if (pauseScript) {
pauseScript = false;
pause.setEnabled(false);
run.setEnabled(true);
stop.setEnabled(false);
}
setScriptState(Script.STATE_STOPPED); setScriptState(Script.STATE_STOPPED);
break; break;
case "Logger": case "Logger":
@@ -217,7 +229,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
Logger.getInstance().setClearable(); Logger.getInstance().setClearable();
} else if (Logger.getInstance().isClearable() && !Logger.getInstance().isVisible()) { } else if (Logger.getInstance().isClearable() && !Logger.getInstance().isVisible()) {
Logger.clearLogger(); Logger.clearLogger();
Logger.addMessage("Logger started", false); Logger.addMessage("Logger initialised", false);
} }
break; break;
case "Disable dialog": case "Disable dialog":
src/main/java/org/parabot/core/ui/Logger.java
+14 -7
View File
@@ -1,11 +1,11 @@
package org.parabot.core.ui; package org.parabot.core.ui;
import org.parabot.core.Context;
import org.parabot.core.ui.components.GamePanel; import org.parabot.core.ui.components.GamePanel;
import org.parabot.environment.scripts.uliratha.UlirathaClient;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/** /**
* @author JKetelaar * @author JKetelaar
@@ -25,12 +25,22 @@ public class Logger extends JPanel {
JScrollPane pane = new JScrollPane(list); JScrollPane pane = new JScrollPane(list);
add(pane, BorderLayout.CENTER); add(pane, BorderLayout.CENTER);
JButton button = new JButton("Clear Logger");
button.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
clearLogger();
addMessage("Logger initialised", false);
}
});
add(button, BorderLayout.SOUTH);
list.setCellRenderer(getRenderer()); list.setCellRenderer(getRenderer());
model = new DefaultListModel<>(); model = new DefaultListModel<>();
list.setModel(model); list.setModel(model);
setPreferredSize(new Dimension((int) GamePanel.getInstance().getPreferredSize().getWidth(), 150)); setPreferredSize(new Dimension((int) GamePanel.getInstance().getPreferredSize().getWidth(), 150));
model.addElement("Logger started"); model.addElement("Logger initialised");
setVisible(false); setVisible(false);
} }
@@ -63,10 +73,7 @@ public class Logger extends JPanel {
instance.model.addElement(message); instance.model.addElement(message);
if (uliratha){ if (uliratha){
UlirathaClient client; // TODO: Implement latest Uliratha
if ((client = Context.getInstance().getUlirathaClient()) != null) {
client.sendMessage(message);
}
} }
int last = instance.list.getModel().getSize() - 1; int last = instance.list.getModel().getSize() - 1;
src/main/java/org/parabot/core/ui/images/Images.java
+2 -23
View File
@@ -1,30 +1,9 @@
package org.parabot.core.ui.images; package org.parabot.core.ui.images;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.util.HashMap;
/** /**
*
* Caches and loads images from resource * Caches and loads images from resource
*
* @author Everel
* *
* @author Everel, JKetelaar
*/ */
public final class Images { public final class Images extends org.parabot.api.io.images.Images {
private static final HashMap<String, BufferedImage> IMAGE_CACHE = new HashMap<String, BufferedImage>();
public static BufferedImage getResource(final String resource) {
if(IMAGE_CACHE.containsKey(resource)) {
return IMAGE_CACHE.get(resource);
}
try {
final BufferedImage img = ImageIO.read(Images.class.getResourceAsStream(resource));
IMAGE_CACHE.put(resource, img);
return img;
} catch (Throwable t) {
throw new RuntimeException("Failed to load image from resource. " + t.getMessage());
}
}
} }
src/main/java/org/parabot/core/ui/images/add.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 152 B

src/main/java/org/parabot/core/ui/images/background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 MiB

src/main/java/org/parabot/core/ui/images/category/agility.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 299 B

src/main/java/org/parabot/core/ui/images/category/combat.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 332 B

src/main/java/org/parabot/core/ui/images/category/cooking.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 331 B

src/main/java/org/parabot/core/ui/images/category/crafting.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 325 B

src/main/java/org/parabot/core/ui/images/category/dungeoneering.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

src/main/java/org/parabot/core/ui/images/category/farming.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 489 B

src/main/java/org/parabot/core/ui/images/category/firemaking.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 357 B

src/main/java/org/parabot/core/ui/images/category/fishing.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 371 B

src/main/java/org/parabot/core/ui/images/category/fletching.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 307 B

src/main/java/org/parabot/core/ui/images/category/herblore.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 311 B

src/main/java/org/parabot/core/ui/images/category/hunter.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

src/main/java/org/parabot/core/ui/images/category/magic.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 611 B

src/main/java/org/parabot/core/ui/images/category/minigames.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

src/main/java/org/parabot/core/ui/images/category/mining.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 343 B

src/main/java/org/parabot/core/ui/images/category/other.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 328 B

src/main/java/org/parabot/core/ui/images/category/prayer.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 431 B

src/main/java/org/parabot/core/ui/images/category/runecrafting.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 371 B

src/main/java/org/parabot/core/ui/images/category/script.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 452 B

src/main/java/org/parabot/core/ui/images/category/slayer.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 668 B

src/main/java/org/parabot/core/ui/images/category/smithing.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 354 B

src/main/java/org/parabot/core/ui/images/category/thieving.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 276 B

src/main/java/org/parabot/core/ui/images/category/utility.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 310 B

src/main/java/org/parabot/core/ui/images/category/woodcutting.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 377 B

src/main/java/org/parabot/core/ui/images/close.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.1 KiB

src/main/java/org/parabot/core/ui/images/close_red.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.1 KiB

src/main/java/org/parabot/core/ui/images/icon.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 76 KiB

src/main/java/org/parabot/core/ui/images/para.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 17 KiB

src/main/java/org/parabot/core/ui/images/pause.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 125 B

src/main/java/org/parabot/core/ui/images/run.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 155 B

src/main/java/org/parabot/core/ui/images/stop.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 110 B

src/main/java/org/parabot/core/ui/images/trash.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

src/main/java/org/parabot/core/ui/listeners/PBKeyListener.java
+67
View File
@@ -0,0 +1,67 @@
package org.parabot.core.ui.listeners;
import org.parabot.core.ui.listeners.key.ActionEventBinding;
import org.parabot.core.ui.listeners.key.Binding;
import org.parabot.environment.OperatingSystem;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.util.ArrayList;
import java.util.List;
/**
* @author JKetelaar
*/
public class PBKeyListener implements KeyListener {
private List<Binding> bindings;
public PBKeyListener() {
this.bindings = new ArrayList<>();
this.fillBindings();
}
private void fillBindings() {
this.bindings.add(new ActionEventBinding(KeyEvent.VK_R, "Run"));
this.bindings.add(new ActionEventBinding(KeyEvent.VK_R, "Stop"));
}
public List<Binding> getBindings() {
return bindings;
}
public void addBinding(Binding binding) {
for (Binding bind : this.bindings){
if (bind.getKey() == binding.getKey()){
return;
}
}
this.bindings.add(binding);
}
public void resetBindings(){
this.bindings = new ArrayList<>();
this.fillBindings();
}
@Override
public void keyTyped(KeyEvent e) {
}
@Override
public void keyPressed(KeyEvent e) {
if (e.isControlDown()) {
for (Binding binding : bindings) {
if (binding.getKey() == e.getKeyCode()) {
binding.perform();
}
}
}
}
@Override
public void keyReleased(KeyEvent e) {
}
}
src/main/java/org/parabot/core/ui/listeners/key/ActionEventBinding.java
+22
View File
@@ -0,0 +1,22 @@
package org.parabot.core.ui.listeners.key;
import org.parabot.core.ui.BotUI;
/**
* @author JKetelaar
*/
public class ActionEventBinding extends Binding {
private String actionString;
public ActionEventBinding(int key, String actionString) {
super(key);
this.actionString = actionString;
}
@Override
public void perform() {
BotUI.getInstance().performCommand(actionString);
}
}
src/main/java/org/parabot/core/ui/listeners/key/Binding.java
+23
View File
@@ -0,0 +1,23 @@
package org.parabot.core.ui.listeners.key;
/**
* @author JKetelaar
*/
public abstract class Binding {
private int key;
public Binding(int key) {
this.key = key;
}
public int getKey() {
return key;
}
public void setKey(int key) {
this.key = key;
}
public abstract void perform();
}
src/main/java/org/parabot/core/ui/utils/SwingUtil.java
+2 -42
View File
@@ -1,48 +1,8 @@
package org.parabot.core.ui.utils; package org.parabot.core.ui.utils;
import org.parabot.core.ui.images.Images;
import org.parabot.environment.OperatingSystem;
import javax.swing.*;
import java.awt.*;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
/** /**
* * @author JKetelaar
* Holds various swing util based methods
*
* @author Dane
*
*/ */
public class SwingUtil { public class SwingUtil extends org.parabot.api.ui.SwingUtil {
/**
* Packs, centers, and shows the frame.
*
* @param f
*/
public static void finalize(JFrame f) {
f.pack();
f.setLocationRelativeTo(null);
f.setVisible(true);
}
public static void setParabotIcons(JFrame f) {
f.setIconImage(Images.getResource("/storage/images/icon.png"));
if(OperatingSystem.getOS() == OperatingSystem.MAC) {
/** Adds the dock icon to mac users */
try {
Class<?> util = Class.forName("com.apple.eawt.Application");
Object application = util.getMethod("getApplication", new Class[] { }).invoke(null);
Method setDockIconImage = util.getMethod("setDockIconImage", new Class[] { Image.class });
setDockIconImage.invoke(application, Images.getResource("/storage/images/icon.png"));
} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {
} catch (Throwable t) {
t.printStackTrace();
}
}
}
} }
src/main/java/org/parabot/environment/Environment.java
-2
View File
@@ -4,7 +4,6 @@ import org.parabot.core.Core;
import org.parabot.core.desc.ServerDescription; import org.parabot.core.desc.ServerDescription;
import org.parabot.core.lib.Library; import org.parabot.core.lib.Library;
import org.parabot.core.lib.javafx.JavaFX; import org.parabot.core.lib.javafx.JavaFX;
import org.parabot.core.lib.naga.Naga;
import org.parabot.core.parsers.servers.ServerParser; import org.parabot.core.parsers.servers.ServerParser;
import org.parabot.core.ui.components.VerboseLoader; import org.parabot.core.ui.components.VerboseLoader;
import org.parabot.environment.api.utils.WebUtil; import org.parabot.environment.api.utils.WebUtil;
@@ -30,7 +29,6 @@ public class Environment {
LinkedList<Library> libs = new LinkedList<>(); LinkedList<Library> libs = new LinkedList<>();
libs.add(new JavaFX()); libs.add(new JavaFX());
libs.add(new Naga());
for(Library lib : libs) { for(Library lib : libs) {
if (lib.requiresJar()) { if (lib.requiresJar()) {
src/main/java/org/parabot/environment/api/utils/Timer.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class Timer {
/** /**
* Timer Constructor * Timer Constructor
* *
* @param start * @param end
*/ */
public Timer(long end) { public Timer(long end) {
src/main/java/org/parabot/environment/api/utils/Version.java
+42 -13
View File
@@ -1,47 +1,76 @@
package org.parabot.environment.api.utils; package org.parabot.environment.api.utils;
import org.parabot.core.ui.utils.UILog;
public class Version implements Comparable<Version> { public class Version implements Comparable<Version> {
private String version; private String version;
public final String get() { private static boolean notified;
return this.version;
}
public Version(String version) { public Version(String version) {
if(version == null) { if (version == null) {
throw new IllegalArgumentException("Version can not be null"); throw new IllegalArgumentException("Version can not be null");
} }
if(!version.matches("[0-9]+(\\.[0-9]+)*")) { if (!version.matches("[0-9]+(\\.[0-9]+)*") && !version.contains("RC")) {
throw new IllegalArgumentException("Invalid version format"); throw new IllegalArgumentException("Invalid version format");
} }
this.version = version; this.version = version;
} }
@Override public int compareTo(Version that) { public final String get() {
if(that == null) { return this.version;
}
public boolean isNightly(){
return this.version.contains("RC");
}
@Override
public int compareTo(Version that) {
if (that == null) {
return 1; return 1;
} }
if (version.contains("RC")) {
notifyRC();
return 1;
}
String[] thisParts = this.get().split("\\."); String[] thisParts = this.get().split("\\.");
String[] thatParts = that.get().split("\\."); String[] thatParts = that.get().split("\\.");
int length = Math.max(thisParts.length, thatParts.length); int length = Math.max(thisParts.length, thatParts.length);
for(int i = 0; i < length; i++) {
for (int i = 0; i < length; i++) {
int thisPart = i < thisParts.length ? int thisPart = i < thisParts.length ?
Integer.parseInt(thisParts[i]) : 0; Integer.parseInt(thisParts[i]) : 0;
int thatPart = i < thatParts.length ? int thatPart = i < thatParts.length ?
Integer.parseInt(thatParts[i]) : 0; Integer.parseInt(thatParts[i]) : 0;
if(thisPart < thatPart) { if (thisPart < thatPart) {
return -1; return -1;
} }
if(thisPart > thatPart) { if (thisPart > thatPart) {
return 1; return 1;
} }
} }
return 0; return 0;
} }
@Override public boolean equals(Object that) { @Override
public boolean equals(Object that) {
return this == that || that != null && this.getClass() == that.getClass() && this.compareTo((Version) that) == 0; return this == that || that != null && this.getClass() == that.getClass() && this.compareTo((Version) that) == 0;
} }
private static void notifyRC() {
if (!notified) {
UILog.log(
"Version warning",
"This is an RC version of Parabot\n" +
"This could be an unstable version of Parabot, and might crash at anytime\n\n" +
"If you find an error within the client, please report any at:\n" +
"https://github.com/Parabot/Parabot/issues"
);
notified = true;
}
}
} }
src/main/java/org/parabot/environment/api/utils/WebUtil.java
+2 -303
View File
@@ -1,311 +1,10 @@
package org.parabot.environment.api.utils; package org.parabot.environment.api.utils;
import org.json.simple.parser.JSONParser;
import org.parabot.core.io.ProgressListener;
import org.parabot.core.io.SizeInputStream;
import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
/** /**
*
* A WebUtil class fetches data from an URL * A WebUtil class fetches data from an URL
* *
* @author Everel * @author Everel
*
*/ */
public class WebUtil { public class WebUtil extends org.parabot.api.io.WebUtil {
private static JSONParser jsonParser;
private static String agent = "Mozilla/5.0 (Wind0ws NT 6.1; WOW64) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1";
/**
* Agent to set at a URL connection
*
* @param userAgent
*/
public static void setUserAgent(final String userAgent) {
agent = userAgent;
}
/**
* Gets useragent
*
* @return useragent
*/
public static String getUserAgent() {
return agent;
}
/**
* Fetches content of a page
*
* @param location
* @return contents of page
* @throws MalformedURLException
*/
public static String getContents(final String location)
throws MalformedURLException {
return getContents(new URL(location));
}
public static String getContents(final String location, String parameters) throws MalformedURLException {
return getContents(new URL(location), parameters);
}
/**
* Get contents from URL
*
* @param url
* @return page contents
*/
public static String getContents(final URL url) {
return getContents(getConnection(url));
}
public static String getContents(final URL url, final String parameters) {
return getContents(getConnection(url), parameters);
}
/**
* Gets contents from URLConnection
*
* @param urlConnection
* @return page contents
*/
public static String getContents(URLConnection urlConnection) {
try {
final BufferedReader in = getReader(urlConnection);
final StringBuilder builder = new StringBuilder();
String line;
if (in != null) {
while ((line = in.readLine()) != null) {
builder.append(line);
}
in.close();
}
return builder.toString();
} catch (Throwable t) {
t.printStackTrace();
}
return null;
}
public static String getContents(URLConnection urlConnection, String parameters) {
try {
urlConnection.setDoOutput(true);
OutputStreamWriter wr = new OutputStreamWriter(urlConnection.getOutputStream());
wr.write(parameters);
wr.flush();
wr.close();
final BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
final StringBuilder builder = new StringBuilder();
String line;
while ((line = in.readLine()) != null) {
builder.append(line);
}
return builder.toString();
} catch (Throwable t) {
t.printStackTrace();
}
return null;
}
/**
* Gets buffered reader from string url
*
* @param url
* @return bufferedreader
*/
public static BufferedReader getReader(final String url) {
try {
return getReader(new URL(url));
} catch (MalformedURLException e) {
e.printStackTrace();
}
return null;
}
/**
* Gets BufferedReader from URL
*
* @param url
* @return BufferedReader from URL
*/
public static BufferedReader getReader(final URL url) {
return getReader(getConnection(url));
}
public static BufferedReader getReader(final URLConnection urlConnection) {
try {
return new BufferedReader(new InputStreamReader(
urlConnection.getInputStream()));
} catch (Throwable t) {
t.printStackTrace();
}
return null;
}
/**
* Gets inputstream from url
*
* @param url
* @return inputstream from url
*/
public static InputStream getInputStream(final URL url) {
final URLConnection con = getConnection(url);
try {
return con.getInputStream();
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
/**
* Opens a connection
*
* @param url
* @return URLConnection to URL
*/
public static URLConnection getConnection(final URL url) {
try {
final URLConnection con = url.openConnection();
con.setRequestProperty("User-Agent", agent);
return con;
} catch (Throwable t) {
t.printStackTrace();
}
return null;
}
public static BufferedReader getReader(final URL url, String username, String password) {
try {
String data = URLEncoder.encode("username", "UTF-8") + "=" + username;
data += "&" + URLEncoder.encode("password", "UTF-8") + "=" + password;
URLConnection connection = url.openConnection();
connection.setDoOutput(true);
OutputStreamWriter wr = new OutputStreamWriter(connection.getOutputStream());
wr.write(data);
wr.flush();
wr.close();
return new BufferedReader(new InputStreamReader(connection.getInputStream()));
} catch (Throwable t) {
t.printStackTrace();
}
return null;
}
public static URLConnection getConnection(final URL url, String username, String password) {
try {
String data = URLEncoder.encode("username", "UTF-8") + "=" + username;
data += "&" + URLEncoder.encode("password", "UTF-8") + "=" + password;
URLConnection connection = url.openConnection();
connection.setDoOutput(true);
OutputStreamWriter wr = new OutputStreamWriter(connection.getOutputStream());
wr.write(data);
wr.flush();
wr.close();
return connection;
} catch (Throwable t) {
t.printStackTrace();
}
return null;
}
/**
* Downloads a file on the internet
* @param url
* @param destination
* @param listener
*/
public static void downloadFile(final URL url, final File destination,
final ProgressListener listener) {
try {
final URLConnection connection = getConnection(url);
int size = connection.getContentLength();
SizeInputStream sizeInputStream = new SizeInputStream(
connection.getInputStream(), size, listener);
BufferedInputStream in = new BufferedInputStream(sizeInputStream);
FileOutputStream fileOut = new FileOutputStream(destination);
try {
byte data[] = new byte[1024];
int count;
while ((count = in.read(data, 0, 1024)) != -1) {
fileOut.write(data, 0, count);
}
} finally {
if (in != null)
in.close();
if (fileOut != null)
fileOut.close();
}
} catch (Throwable t) {
t.printStackTrace();
}
}
/**
* Downloads a file on the internet
* @param url
* @param destination
* @param listener
*/
public static void downloadFile(final URL url, final File destination,
final ProgressListener listener, String username, String password) {
try {
final URLConnection connection = getConnection(url, username, password);
int size = connection.getContentLength();
SizeInputStream sizeInputStream = new SizeInputStream(
connection.getInputStream(), size, listener);
BufferedInputStream in = new BufferedInputStream(sizeInputStream);
FileOutputStream fileOut = new FileOutputStream(destination);
try {
byte data[] = new byte[1024];
int count;
while ((count = in.read(data, 0, 1024)) != -1) {
fileOut.write(data, 0, count);
}
} finally {
if (in != null)
in.close();
if (fileOut != null)
fileOut.close();
}
} catch (Throwable t) {
t.printStackTrace();
}
}
/**
* Converts file format to url format
* @param file
* @return url to file
*/
public static URL toURL(File file) {
try {
return file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
return null;
}
public static JSONParser getJsonParser() {
if (jsonParser == null){
jsonParser = new JSONParser();
}
return jsonParser;
}
} }
src/main/java/org/parabot/environment/api/utils/WindowsPreferences.java
-1105
View File
File diff suppressed because it is too large Load Diff
src/main/java/org/parabot/environment/scripts/Script.java
+2 -6
View File
@@ -123,10 +123,8 @@ public class Script implements Runnable {
this.state = STATE_STOPPED; this.state = STATE_STOPPED;
context.setRunningScript(null); context.setRunningScript(null);
if (context.getUlirathaClient() != null) { Core.verbose("Resetting key bindings...");
context.getUlirathaClient().disconnect(); Context.getInstance().getPbKeyListener().resetBindings();
context.setUlirathaClient(null);
}
BotUI.getInstance().toggleRun(); BotUI.getInstance().toggleRun();
Core.verbose("Done."); Core.verbose("Done.");
@@ -156,7 +154,6 @@ public class Script implements Runnable {
if(state < 0 || state > 2) { if(state < 0 || state > 2) {
throw new IllegalArgumentException("Illegal state"); throw new IllegalArgumentException("Illegal state");
} }
Core.setBugsnagInformation("Script", "State", String.valueOf(state));
this.state = state; this.state = state;
} }
@@ -181,6 +178,5 @@ public class Script implements Runnable {
public void setScriptID(int scriptID){ public void setScriptID(int scriptID){
this.scriptID = scriptID; this.scriptID = scriptID;
Core.setBugsnagInformation("Script", "State", String.valueOf(scriptID));
} }
} }
src/main/java/org/parabot/environment/scripts/executers/BDNScriptsExecuter.java
-4
View File
@@ -8,7 +8,6 @@ import org.parabot.core.ui.utils.UILog;
import org.parabot.environment.api.utils.WebUtil; import org.parabot.environment.api.utils.WebUtil;
import org.parabot.environment.scripts.Script; import org.parabot.environment.scripts.Script;
import org.parabot.environment.scripts.loader.JavaScriptLoader; import org.parabot.environment.scripts.loader.JavaScriptLoader;
import org.parabot.environment.scripts.uliratha.UlirathaExecuter;
import javax.swing.*; import javax.swing.*;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
@@ -77,9 +76,6 @@ public class BDNScriptsExecuter extends ScriptExecuter {
script.setScriptID(this.id); script.setScriptID(this.id);
super.finalize(tg, script); super.finalize(tg, script);
if (manager.getAccount().getApi() != null) {
new UlirathaExecuter(manager.getAccount().getApi()).start(this.id);
}
} catch (NoClassDefFoundError | ClassNotFoundException ignored) { } catch (NoClassDefFoundError | ClassNotFoundException ignored) {
UILog.log("Error", "Failed to load BDN script, error: [This server provider does not support this script]", JOptionPane.ERROR_MESSAGE); UILog.log("Error", "Failed to load BDN script, error: [This server provider does not support this script]", JOptionPane.ERROR_MESSAGE);
} catch (Throwable t) { } catch (Throwable t) {
src/main/java/org/parabot/environment/scripts/uliratha/UlirathaClient.java
-158
View File
@@ -1,158 +0,0 @@
package org.parabot.environment.scripts.uliratha;
import naga.ExceptionObserver;
import naga.NIOService;
import naga.NIOSocket;
import naga.SocketObserver;
import naga.packetreader.RegularPacketReader;
import naga.packetwriter.RegularPacketWriter;
import org.parabot.core.ui.Logger;
import java.io.*;
/**
* @author JKetelaar
*/
public class UlirathaClient extends Thread {
private String host;
private int port;
private NIOSocket socket;
private boolean connected;
private int scriptID;
private String api;
private boolean valid;
public UlirathaClient(String host, int port, int scriptID, String api) {
this.host = host;
this.port = port;
this.scriptID = scriptID;
this.api = api;
}
@Override
public void run() {
connect();
}
private void connect() {
try {
NIOService service = new NIOService();
service.setExceptionObserver(new ExceptionObserver() {
@Override
public void notifyExceptionThrown(Throwable throwable) {
throwable.printStackTrace();
if (valid) {
reconnect();
connected = false;
}
}
});
socket = service.openSocket(host, port);
socket.setPacketReader(new RegularPacketReader(4, true));
socket.setPacketWriter(new RegularPacketWriter(4, true));
socket.listen(new SocketObserver() {
public void connectionOpened(NIOSocket nioSocket) {
try {
sendObjects(nioSocket, new Object[]{76, scriptID, api});
} catch (IOException e) {
e.printStackTrace();
}
}
public void packetReceived(NIOSocket socket, byte[] packet) {
try {
DataInputStream stream = new DataInputStream(new ByteArrayInputStream(packet));
int packetID = stream.readInt();
switch (packetID){
case 75:
valid = stream.readBoolean();
if (valid) {
Logger.addMessage("We're connected with the Uliratha server!", false);
connected = true;
}else{
socket.close();
}
break;
}
} catch (IOException e) {
e.printStackTrace();
}
}
@Override
public void packetSent(NIOSocket nioSocket, Object o) {
}
public void connectionBroken(NIOSocket nioSocket, Exception exception) {
if (valid) {
Logger.addMessage("We lost connection with the Uliratha server, reconnecting...", false);
reconnect();
connected = false;
}else{
Logger.addMessage("We're disconnected from the Uliratha server", false);
}
}
});
while (true) {
service.selectBlocking();
}
} catch (IOException e) {
if (valid) {
reconnect();
connected = false;
}
}
}
private void reconnect() {
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
connect();
}
public boolean isConnected() {
return connected;
}
public void disconnect(){
valid = false;
socket.close();
}
private void sendObjects(NIOSocket socket, Object[] objects) throws IOException {
ByteArrayOutputStream stream = new ByteArrayOutputStream();
DataOutputStream dataStream = new DataOutputStream(stream);
for (Object o : objects) {
if (o instanceof String) {
dataStream.writeUTF((String) o);
} else if (o instanceof Integer) {
dataStream.writeInt((Integer) o);
} else if (o instanceof byte[]) {
dataStream.write((byte[]) o);
} else if (o instanceof Long) {
dataStream.writeLong((Long) o);
} else if (o instanceof Boolean) {
dataStream.writeBoolean((Boolean) o);
}
}
dataStream.flush();
final byte[] content = stream.toByteArray();
dataStream.close();
socket.write(content);
}
public void sendMessage(String message){
try {
sendObjects(socket, new Object[]{83, message});
} catch (IOException e) {
e.printStackTrace();
}
}
}
src/main/java/org/parabot/environment/scripts/uliratha/UlirathaExecuter.java
-49
View File
@@ -1,49 +0,0 @@
package org.parabot.environment.scripts.uliratha;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import org.parabot.core.Context;
import org.parabot.environment.api.utils.WebUtil;
import java.io.IOException;
/**
* @author JKetelaar
*/
public class UlirathaExecuter {
private String api;
private static boolean isVip = true;
public UlirathaExecuter(String api){
this.api = api;
}
public void start(int scriptID){
if (UlirathaExecuter.isVip) {
String vipUrl = "http://bdn.parabot.org/api/v2/user/" + api + "/vip";
JSONParser parser = new JSONParser();
try {
JSONObject vipObject = (JSONObject) parser.parse(WebUtil.getReader(vipUrl));
boolean isVip = (boolean) vipObject.get("result");
if (isVip) {
String serverUrl = "http://bdn.parabot.org/api/v2/clients/server";
JSONObject serverObject = (JSONObject) parser.parse(WebUtil.getReader(serverUrl));
JSONObject detailsObject = (JSONObject) serverObject.get("result");
String host = (String) detailsObject.get("host");
long port = (long) detailsObject.get("port");
UlirathaClient client = new UlirathaClient(host, (int) port, scriptID, api);
client.start();
Context.getInstance().setUlirathaClient(client);
}else{
UlirathaExecuter.isVip = false;
}
} catch (IOException | ParseException | ClassCastException e) {
e.printStackTrace();
}
}
}
}
src/main/java/org/parabot/environment/servers/executers/PublicServerExecuter.java
+2 -3
View File
@@ -54,8 +54,7 @@ public class PublicServerExecuter extends ServerExecuter {
final File destination = new File(Directories.getCachePath(), final File destination = new File(Directories.getCachePath(),
serverProviderInfo.getCRC32() + ".jar"); serverProviderInfo.getCRC32() + ".jar");
final String jarUrl = Configuration.GET_SERVER_PROVIDER final String jarUrl = String.format(Configuration.GET_SERVER_PROVIDER, Configuration.BOT_VERSION.isNightly());
+ this.serverName;
Core.verbose("Downloading: " + jarUrl + " ..."); Core.verbose("Downloading: " + jarUrl + " ...");
@@ -63,7 +62,7 @@ public class PublicServerExecuter extends ServerExecuter {
Core.verbose("Found cached server provider [CRC32: " + serverProviderInfo.getCRC32() + "]"); Core.verbose("Found cached server provider [CRC32: " + serverProviderInfo.getCRC32() + "]");
} else { } else {
WebUtil.downloadFile(new URL(jarUrl), destination, WebUtil.downloadFile(new URL(jarUrl), destination,
VerboseLoader.get(), manager.getAccount().getURLUsername(), manager.getAccount().getURLPassword()); VerboseLoader.get());
Core.verbose("Server provider downloaded..."); Core.verbose("Server provider downloaded...");
} }
src/main/java/org/parabot/environment/servers/executers/ServerExecuter.java
-2
View File
@@ -24,8 +24,6 @@ public abstract class ServerExecuter {
@Override @Override
public void run() { public void run() {
try { try {
Core.setBugsnagServer(serverName);
Context context = Context.getInstance(provider); Context context = Context.getInstance(provider);
context.load(); context.load();
PaintComponent.getInstance().startPainting(context); PaintComponent.getInstance().startPainting(context);
src/main/resources/storage/app.properties
-1
View File
@@ -1 +0,0 @@
application.version=${project.version}
src/main/resources/storage/images/icon.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 76 KiB

src/main/resources/storage/parabot.properties
Executable
+1
View File
@@ -0,0 +1 @@
application.version=${project.version}${build.version}