Merges Injector

Welcome to the new world boys.

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

.github/CONTRIBUTING.md

@@ -1,134 +0,0 @@
-# Contributing to runelite
-
-We'd love for you to contribute to our source code and to make runelite even better than it is
-today!
-
-Check out the Developer's Guide on the [wiki](https://github.com/runelite/runelite/wiki) for setup instructions, and general tips and tricks.
-
-Here are the guidelines we'd like you to follow:
-
- - [Question or Problem?](#question)
- - [Issues and Bugs](#issue)
- - [Submission Guidelines](#submit)
- - [Coding Format](#format)
-
-## <a name="question"></a> Got a Question or Problem?
-
-If you have questions about how to contribute to runelite, please join our [Discord](https://discord.gg/HN5gf3m) server.
-
-## <a name="issue"></a> Found an Issue?
-
-If you find a bug in the source code or a mistake in the documentation, you can help us by
-submitting an issue to our [GitHub Repository][github]. Even better you can submit a Pull Request
-with a fix.
-
-**Please see the [Submission Guidelines](#submit) below.**
-
-## <a name="submit"></a> Submission Guidelines
-
-### Submitting an Issue
-Before you submit your issue search the archive, maybe your question was already answered.
-
-If your issue appears to be a bug and hasn't been reported, open a new issue. Help us to maximize
-the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
-Providing the following information will increase the chances of your issue being dealt with
-quickly:
-
-* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
-* **Java Version and Operating System** - is this a problem with a specific setup?
-* **Reproduce the Error** - provide details, if possible, on how to reproduce the error
-* **Related Issues** - has a similar issue been reported before?
-* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be causing the problem (line of code or commit)
-
-### Submitting a Pull Request
-Before you submit your pull request consider the following guidelines:
-
-* Search [GitHub](https://github.com/runelite-extended/runelite/pulls) for an open or closed Pull Request
-  that relates to your submission. You don't want to duplicate effort.
-* [Fork](https://help.github.com/articles/fork-a-repo/) this repo.
-* [Clone](https://help.github.com/articles/cloning-a-repository/) your copy.
-    ```shell
-    git clone https://github.com/YOUR_USERNAME/runelite.git
-    cd runelite/
-    ```
-* After cloning, set a new remote [upstream](https://help.github.com/articles/configuring-a-remote-for-a-fork/) (this helps to keep your fork up to date)
-    
-    ```shell
-    git remote add upstream https://github.com/runelite-extended/runelite.git
-    ```
-
-* Make your changes in a new git branch:
-
-    ```shell
-    git checkout -b my-fix-branch master
-    ```
-
-* Create your patch and run appropriate tests.
-* Follow our [Coding Format](#format).
-* Commit your changes using a descriptive commit message that uses the imperative, present tense: "change" not "changed" nor "changes".
-
-    ```shell
-    git commit -a
-    ```
-  Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
-
-* Push your branch to GitHub:
-
-    ```shell
-    git push origin my-fix-branch
-    ```
-
-In GitHub, send a pull request to `runelite:master`.
-If we suggest changes, then:
-
-* Make the required updates.
-* Re-run runelite and make sure any and all tests are still passing.
-* Commit your changes to your branch (e.g. `my-fix-branch`).
-* Push the changes to your GitHub repository (this will update your Pull Request).
-
-If the PR gets too outdated we may ask you to rebase and force push to update the PR:
-
-```shell
-git fetch upstream
-git rebase upstream/master
-git push origin my-fix-branch -f
-```
-
-That's it! Thank you for your contribution!
-
-#### After your pull request is merged
-
-After your pull request is merged, you can safely delete your branch and pull the changes
-from the main (upstream) repository:
-
-* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
-
-    ```shell
-    git push origin --delete my-fix-branch
-    ```
-
-* Check out the master branch:
-
-    ```shell
-    git checkout master -f
-    ```
-
-* Delete the local branch:
-
-    ```shell
-    git branch -D my-fix-branch
-    ```
-
-* Update your master with the latest upstream version:
-
-    ```shell
-    git pull --ff upstream master
-    ```
-
-## <a name="format"></a> Coding Format
-
-To ensure consistency throughout the source code, review our [code conventions](https://github.com/runelite/runelite/wiki/Code-Conventions).
-
-
-[github]: https://github.com/runelite-extended/runelite
-[discord]: https://discord.gg/HN5gf3m

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -1,32 +0,0 @@
----
-name: "\U0001F41B Bug report"
-about: Create a report to help us improve
-
----
-
-Please check if your issue is not a duplicate by [searching existing issues](https://github.com/runelite/runelite/search?type=Issues)
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Environment (please complete the following information):**
- - OS: [e.g. Windows, Ubuntu, macOS]
- - RuneLite version: [e.g 1.4.6]
- - Launcher version: [e.g 1.5.2]
-
-**Additional context**
-Add any other context about the problem here, e.g. logs. Your client logs can usually be found in
-`C:\Users\<your_user_name>\.runelite\logs` on Windows and `~/.runelite/logs` on Linux and macOS.

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -1,19 +0,0 @@
----
-name: "\U0001F680  Feature Request"
-about: Suggest an idea for this project
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always
-frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've
-considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.gitignore

@@ -1,15 +1,6 @@
-target
-nbactions.xml
-nb-configuration.xml
-/nbproject/
-project.properties
-*.iml
-.idea/
-.project
-.settings/
-.classpath
-runelite-client/src/main/resources/META-INF/MANIFEST.MF
-git
-classes/artifacts/client_jar/run.bat
-classes/artifacts/client_jar/client.jar
 *.jar
+*.iml
+
+.idea/
+dependency-reduced-pom.xml
+**/target/*

.mvn/jvm.config

@@ -1 +0,0 @@
--Xmx512m

.travis.yml

@@ -1,11 +0,0 @@
-language: java
-sudo: false
-dist: xenial
-cache:
-  directories:
-    - $HOME/.m2
-jdk:
-- openjdk8
-- openjdk11
-install: true
-script: ./travis/build.sh

LICENSE

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

README.md

@@ -1,25 +0,0 @@
-![](https://i.imgur.com/OVRdQBz.png)
-
-
-
-# RuneLitePlus [![Build Status](https://travis-ci.org/runelite-extended/runelite.svg?branch=master)](https://travis-ci.org/runelite-extended/runelite) [![Discord](https://img.shields.io/discord/373382904769675265.svg)](https://discord.gg/HN5gf3m)
-
-[RuneLitePlus](https://runelitepl.us)  is a fork of [RuneLite](https://github.com/runelite/runelite) that provides more functionality and less restrictions while staying open source. This is meant to directly compete with 3rd party RL clients that are trying to sell their code.
-
-## Project Layout
-
-- [cache](cache/src/main/java/net/runelite/cache) - Libraries used for reading/writing cache files, as well as the data in it
-- [http-api](http-api/src/main/java/net/runelite/http/api) - API for api.runelite.net
-- [http-service](http-service/src/main/java/net/runelite/http/service) - Service for api.runelite.net
-- [runelite-api](runelite-api/src/main/java/net/runelite/api) - RuneLite API, interfaces for accessing the client
-- [runelite-mixins](runelite-mixins/src/main/java/net/runelite) - Mixins which are injected into the injected client's classes
-- [runescape-api](runescape-api/src/main/java/net/runelite) - Mappings correspond to these interfaces, runelite-api is a subset of this
-- [runelite-client](runelite-client/src/main/java/net/runelite/client) - Game client with plugins
-
-## License
-
-RuneLitePlus is licensed under the BSD 2-clause license. See the license header in the respective file to be sure.
-
-## Contribute and Develop
-
-We've set up a separate document for our [contribution guidelines](https://github.com/runelite-extended/runelite/blob/master/.github/CONTRIBUTING.md).

RuneLitePlus/Test.java

@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2018, https://runelitepl.us
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.runeswag.client.plugins;
+
+import api.Client;
+import api.events.ChatMessage;
+import api.events.ClientTick;
+import api.events.GameTick;
+import api.events.MenuOpened;
+import api.events.VarbitChanged;
+import com.google.common.eventbus.Subscribe;
+import com.google.inject.Binder;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import com.google.inject.Provides;
+import com.runeswag.client.config.ConfigManager;
+import com.runeswag.client.misc.Plugin;
+import com.runeswag.client.misc.PluginDescriptor;
+import com.runeswag.client.ui.OverlayManager;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Authors gazivodag longstreet
+ */
+@PluginDescriptor(
+        name = "Test",
+        description = "Testing plugin for building functionality",
+        tags = {}
+)
+@Singleton
+@Slf4j
+public class Test extends Plugin
+{
+
+    @Provides
+    TestConfig getConfig(ConfigManager configManager)
+    {
+        return configManager.getConfig(TestConfig.class);
+    }
+
+    @Inject
+    private TestOverlay testOverlay;
+
+    @Inject
+    private TestConfig config;
+
+    @Inject
+    private Client client;
+
+    @Inject
+    private OverlayManager overlayManager;
+
+    @Override
+    public void configure(Binder binder)
+    {
+    }
+
+    @Override
+    protected void startUp() throws Exception
+    {
+        overlayManager.add(testOverlay);
+        System.out.println("Test Plugin started");
+    }
+
+    @Override
+    protected void shutDown() throws Exception
+    {
+
+    }
+
+    @Subscribe
+    public void onMenuOpened(MenuOpened event)
+    {
+        System.out.println("[Test Plugin] Menu Opened");
+    }
+
+    @Subscribe
+    public void onChatMessage(ChatMessage chatMessage)
+    {
+        System.out.println("[Test Plugin] Chat Message");
+    }
+
+    @Subscribe
+    public void onVarbitChanged(VarbitChanged event)
+    {
+        System.out.println("[Test Plugin] Varbit Changed");
+    }
+}

RuneLitePlus/TestConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Adam <Adam@sigterm.info>
+ * Copyright (c) 2018, Cas <https://github.com/casvandongen>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,25 +22,25 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.client.config;
+package com.runeswag.client.plugins;
+
+import com.runeswag.client.config.Config;
+import com.runeswag.client.config.ConfigGroup;
+import com.runeswag.client.config.ConfigItem;
+
+import java.awt.*;
 
 @ConfigGroup("test")
-public interface TestConfig
+public interface TestConfig extends Config
 {
 	@ConfigItem(
-		keyName = "key",
+		keyName = "Testing 1",
-		name = "Key Name",
+		name = "Test option",
-		description = "value"
+		description = "Enable/disable nothing",
+		position = 1
 	)
-	default String key()
+	default boolean tested()
 	{
-		return "default";
+		return true;
 	}
-
-	@ConfigItem(
-		keyName = "key",
-		name = "Key Name",
-		description = "value"
-	)
-	void key(String key);
 }

RuneLitePlus/TestOverlay.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018, Adam <Adam@sigterm.info>
+ * Copyright (c) 2018, Cas <https://github.com/casvandongen>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,28 +23,41 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.mixins;
+package com.runeswag.client.plugins;
 
-import net.runelite.api.mixins.Inject;
+import api.Client;
-import net.runelite.api.mixins.Mixin;
+import com.runeswag.client.ui.Overlay;
-import net.runelite.rs.api.RSIgnore;
+import com.runeswag.client.ui.OverlayLayer;
-import net.runelite.rs.api.RSName;
+import com.runeswag.client.ui.OverlayPosition;
 
-@Mixin(RSIgnore.class)
+import javax.inject.Inject;
-public abstract class RSIgnoreMixin implements RSIgnore
+import java.awt.*;
+
+class TestOverlay extends Overlay
 {
-	@Override
+	private static final Color SHORTCUT_HIGH_LEVEL_COLOR = Color.ORANGE;
+
+	private final Client client;
+	private final Test plugin;
+	private final TestConfig config;
+
 	@Inject
-	public String getName()
+	private TestOverlay(Client client, Test plugin, TestConfig config)
 	{
-		return getRsName().getName();
+		super(plugin);
+		setPosition(OverlayPosition.DYNAMIC);
+		setLayer(OverlayLayer.ABOVE_SCENE);
+		this.client = client;
+		this.plugin = plugin;
+		this.config = config;
 	}
 
 	@Override
-	@Inject
+	public Dimension render(Graphics2D graphics)
-	public String getPrevName()
 	{
-		RSName prevName = getRsPrevName();
+		System.out.println("Rendered Test");
-		return prevName == null ? null : prevName.getName();
+		graphics.setColor(Color.RED);
+		graphics.drawString("Hello World", 20, 20);
+		return null;
 	}
 }

RuneLitePlus/pom.xml

@@ -27,9 +27,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>net.runelite</groupId>
+		<groupId>com.runeswag</groupId>
-		<artifactId>runelite-parent</artifactId>
+		<artifactId>runeswag-parent</artifactId>
-		<version>1.5.27-SNAPSHOT</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>client</artifactId>
@@ -66,121 +66,126 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
+			<version>1.8.0-beta4</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
+			<version>1.3.0-alpha4</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.jopt-simple</groupId>
 			<artifactId>jopt-simple</artifactId>
-			<version>${jopt.version}</version>
+			<version>5.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
+			<version>27.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
-			<version>${guice.version}</version>
+			<version>4.2.2</version>
 			<classifier>no_aop</classifier>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
+			<version>2.8.5</version>
 		</dependency>
 		<dependency>
 			<groupId>net.runelite.pushingpixels</groupId>
 			<artifactId>substance</artifactId>
-			<version>${runelite.pushingpixels.substance.version}</version>
+			<version>8.0.02</version>
 		</dependency>
 		<dependency>
 			<groupId>net.runelite.pushingpixels</groupId>
 			<artifactId>trident</artifactId>
-			<version>${runelite.pushingpixels.trident.version}</version>
+			<version>1.5.00</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
+			<version>1.18.6</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-text</artifactId>
-			<version>${commons.text.version}</version>
+			<version>1.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.jogl</groupId>
 			<artifactId>jogl-all</artifactId>
-			<version>${jogl.version}</version>
+			<version>2.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.jogl</groupId>
 			<artifactId>jogl-all</artifactId>
-			<version>${jogl.version}</version>
+			<version>2.3.2</version>
 			<classifier>natives-windows-amd64</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.jogl</groupId>
 			<artifactId>jogl-all</artifactId>
-			<version>${jogl.version}</version>
+			<version>2.3.2</version>
 			<classifier>natives-windows-i586</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.jogl</groupId>
 			<artifactId>jogl-all</artifactId>
-			<version>${jogl.version}</version>
+			<version>2.3.2</version>
 			<classifier>natives-linux-amd64</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.jogl</groupId>
 			<artifactId>jogl-all</artifactId>
-			<version>${jogl.version}</version>
+			<version>2.3.2</version>
 			<classifier>natives-linux-i586</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.gluegen</groupId>
 			<artifactId>gluegen-rt</artifactId>
-			<version>${jogl.version}</version>
+			<version>2.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.gluegen</groupId>
 			<artifactId>gluegen-rt</artifactId>
-			<version>${jogl.version}</version>
+			<version>2.3.2</version>
 			<classifier>natives-windows-amd64</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.gluegen</groupId>
 			<artifactId>gluegen-rt</artifactId>
-			<version>${jogl.version}</version>
+			<version>2.3.2</version>
 			<classifier>natives-windows-i586</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.gluegen</groupId>
 			<artifactId>gluegen-rt</artifactId>
-			<version>${jogl.version}</version>
+			<version>2.3.2</version>
 			<classifier>natives-linux-amd64</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.gluegen</groupId>
 			<artifactId>gluegen-rt</artifactId>
-			<version>${jogl.version}</version>
+			<version>2.3.2</version>
 			<classifier>natives-linux-i586</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.sigpipe</groupId>
 			<artifactId>jbsdiff</artifactId>
-			<version>${sigpipe.jbsdiff.version}</version>
+			<version>1.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.tukaani</groupId>
@@ -192,18 +197,18 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>${java.dev.jna.version}</version>
+			<version>4.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna-platform</artifactId>
-			<version>${java.dev.jna.version}</version>
+			<version>4.5.1</version>
 		</dependency>
 
 		<dependency>
-			<groupId>net.runelite</groupId>
+			<groupId>com.runeswag</groupId>
-			<artifactId>runelite-api</artifactId>
+			<artifactId>api</artifactId>
-			<version>${project.version}</version>
+			<version>1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.runelit</groupId>
@@ -214,17 +219,17 @@
 		<dependency>
 			<groupId>net.runelite</groupId>
 			<artifactId>http-api</artifactId>
-			<version>${project.version}</version>
+			<version>1.5.26-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.runelite</groupId>
 			<artifactId>discord</artifactId>
-			<version>${runelite.discord.version}</version>
+			<version>1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.runelite</groupId>
 			<artifactId>orange-extensions</artifactId>
-			<version>${runelite.orange.extensions.version}</version>
+			<version>1.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<!--		<dependency>
@@ -235,27 +240,29 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<version>4.13-beta-3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
+			<version>2.0.2-beta</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
-			<version>${hamcrest.version}</version>
+			<version>2.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject.extensions</groupId>
 			<artifactId>guice-testlib</artifactId>
-			<version>${guice.version}</version>
+			<version>4.2.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject.extensions</groupId>
 			<artifactId>guice-grapher</artifactId>
-			<version>${guice.version}</version>
+			<version>4.2.2</version>
 			<scope>test</scope>
 		</dependency>
         <dependency>
@@ -283,7 +290,12 @@
 			<artifactId>asm-all</artifactId>
 			<version>6.0_BETA</version>
 		</dependency>
-    </dependencies>
+		<dependency>
+			<groupId>io.sentry</groupId>
+			<artifactId>sentry-logback</artifactId>
+			<version>1.7.16</version>
+		</dependency>
+	</dependencies>
 
 	<build>
 		<resources>
@@ -404,17 +416,13 @@
 					</execution>
 				</executions>
 				<configuration>
-					<skip>${jarsigner.skip}</skip>
+					<skip>true</skip>
-					<keystore>${jarsigner.keystore}</keystore>
-					<alias>${jarsigner.alias}</alias>
-					<storepass>${jarsigner.storepass}</storepass>
-					<keypass>${jarsigner.keypass}</keypass>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>net.runelite</groupId>
 				<artifactId>script-assembler-plugin</artifactId>
-				<version>${project.version}</version>
+				<version>1.5.23-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<id>assemble</id>

RuneLitePlus/src/main/java/net/runelite/client/Notifier.java

@@ -24,6 +24,9 @@
  */
 package net.runelite.client;
 
+import api.ChatMessageType;
+import api.Client;
+import api.GameState;
 import com.google.common.base.Strings;
 import com.google.common.escape.Escaper;
 import com.google.common.escape.Escapers;
@@ -44,9 +47,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.ChatMessageType;
-import net.runelite.api.Client;
-import net.runelite.api.GameState;
 import net.runelite.client.chat.ChatColorType;
 import net.runelite.client.chat.ChatMessageBuilder;
 import net.runelite.client.chat.ChatMessageManager;

RuneLitePlus/src/main/java/net/runelite/client/RuneLite.java

@@ -24,6 +24,7 @@
  */
 package net.runelite.client;
 
+import api.Client;
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import com.google.common.annotations.VisibleForTesting;
@@ -45,7 +46,6 @@ import joptsimple.OptionSet;
 import joptsimple.util.EnumConverter;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Client;
 import net.runelite.client.account.SessionManager;
 import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.chat.CommandManager;

RuneLitePlus/src/main/java/net/runelite/client/RuneLiteModule.java

@@ -24,6 +24,8 @@
  */
 package net.runelite.client;
 
+import api.Client;
+import api.hooks.Callbacks;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.name.Names;
@@ -33,8 +35,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nullable;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Client;
-import net.runelite.api.hooks.Callbacks;
 import net.runelite.client.account.SessionManager;
 import net.runelite.client.callback.Hooks;
 import net.runelite.client.chat.ChatMessageManager;

RuneLitePlus/src/main/java/net/runelite/client/RuneLiteProperties.java

@@ -92,8 +92,8 @@ public class RuneLiteProperties
 		}
 		else
 		{
-			return properties.getProperty(DISCORD_APP_ID);
+		return properties.getProperty(DISCORD_APP_ID);
-		}
+	}
 	}
 
 	public String getDiscordInvite()

RuneLitePlus/src/main/java/net/runelite/client/SessionClient.java

@@ -39,7 +39,7 @@ class SessionClient
 {
 	UUID open() throws IOException
 	{
-		HttpUrl url = RuneLiteAPI.getRuneLitePlusSessionBase().newBuilder()
+		HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder()
 			.build();
 
 		Request request = new Request.Builder()
@@ -61,7 +61,7 @@ class SessionClient
 
 	void ping(UUID uuid) throws IOException
 	{
-		HttpUrl url = RuneLiteAPI.getRuneLitePlusSessionBase().newBuilder()
+		HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder()
 			.addPathSegment("ping")
 			.addQueryParameter("session", uuid.toString())
 			.build();
@@ -81,7 +81,7 @@ class SessionClient
 
 	void delete(UUID uuid) throws IOException
 	{
-		HttpUrl url = RuneLiteAPI.getRuneLitePlusSessionBase().newBuilder()
+		HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder()
 			.addQueryParameter("session", uuid.toString())
 			.build();
 

RuneLitePlus/src/main/java/net/runelite/client/callback/ClientThread.java

@@ -24,13 +24,13 @@
  */
 package net.runelite.client.callback;
 
+import api.Client;
 import com.google.inject.Inject;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.function.BooleanSupplier;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Client;
 
 @Singleton
 @Slf4j

RuneLitePlus/src/main/java/net/runelite/client/callback/Hooks.java

@@ -24,6 +24,23 @@
  */
 package net.runelite.client.callback;
 
+import api.BufferProvider;
+import api.Client;
+import api.MainBufferProvider;
+import api.NullItemID;
+import api.Point;
+import api.RenderOverview;
+import api.Renderable;
+import api.WorldMapManager;
+import api.config.Constants;
+import api.events.BeforeMenuRender;
+import api.events.BeforeRender;
+import api.events.GameTick;
+import api.hooks.Callbacks;
+import api.hooks.DrawCallbacks;
+import api.widgets.Widget;
+import static api.widgets.WidgetInfo.WORLD_MAP_VIEW;
+import api.widgets.WidgetItem;
 import com.google.inject.Injector;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -40,23 +57,6 @@ import java.awt.image.VolatileImage;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.BufferProvider;
-import net.runelite.api.Client;
-import net.runelite.api.Constants;
-import net.runelite.api.MainBufferProvider;
-import net.runelite.api.NullItemID;
-import net.runelite.api.Point;
-import net.runelite.api.RenderOverview;
-import net.runelite.api.Renderable;
-import net.runelite.api.WorldMapManager;
-import net.runelite.api.events.BeforeMenuRender;
-import net.runelite.api.events.BeforeRender;
-import net.runelite.api.events.GameTick;
-import net.runelite.api.hooks.Callbacks;
-import net.runelite.api.hooks.DrawCallbacks;
-import net.runelite.api.widgets.Widget;
-import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_VIEW;
-import net.runelite.api.widgets.WidgetItem;
 import net.runelite.client.Notifier;
 import net.runelite.client.RuneLite;
 import net.runelite.client.chat.ChatMessageManager;
@@ -402,8 +402,8 @@ public class Hooks implements Callbacks
 		{
 			Point p = client.getMouseCanvasPosition();
 			p = new Point(
-				p.getX() - client.getViewportXOffset(),
+					p.getX() - client.getViewportXOffset(),
-				p.getY() - client.getViewportYOffset());
+					p.getY() - client.getViewportYOffset());
 
 			client.setCheckClick(true);
 			client.setMouseCanvasHoverPosition(p);
@@ -515,6 +515,7 @@ public class Hooks implements Callbacks
 		}
 	}
 
+
 	@Override
 	public void drawItem(int itemId, WidgetItem widgetItem)
 	{

RuneLitePlus/src/main/java/net/runelite/client/chat/ChatCommand.java

@@ -24,11 +24,11 @@
  */
 package net.runelite.client.chat;
 
+import api.events.ChatMessage;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import net.runelite.api.events.ChatMessage;
 import net.runelite.client.events.ChatInput;
 
 @AllArgsConstructor

RuneLitePlus/src/main/java/net/runelite/client/chat/ChatCommandManager.java

@@ -24,6 +24,9 @@
  */
 package net.runelite.client.chat;
 
+import api.Client;
+import api.GameState;
+import api.events.ChatMessage;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
@@ -32,9 +35,6 @@ import java.util.function.BiPredicate;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Client;
-import net.runelite.api.GameState;
-import net.runelite.api.events.ChatMessage;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.events.ChatInput;

RuneLitePlus/src/main/java/net/runelite/client/chat/ChatMessageManager.java

@@ -24,6 +24,17 @@
  */
 package net.runelite.client.chat;
 
+import api.ChatLineBuffer;
+import api.ChatMessageType;
+import api.Client;
+import api.MessageNode;
+import api.Player;
+import api.Varbits;
+import api.events.ChatMessage;
+import api.events.ConfigChanged;
+import api.events.ResizeableChanged;
+import api.events.ScriptCallbackEvent;
+import api.events.VarbitChanged;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
 import com.google.common.collect.HashMultimap;
@@ -39,17 +50,6 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import net.runelite.api.ChatLineBuffer;
-import net.runelite.api.ChatMessageType;
-import net.runelite.api.Client;
-import net.runelite.api.MessageNode;
-import net.runelite.api.Player;
-import net.runelite.api.Varbits;
-import net.runelite.api.events.ChatMessage;
-import net.runelite.api.events.ConfigChanged;
-import net.runelite.api.events.ResizeableChanged;
-import net.runelite.api.events.ScriptCallbackEvent;
-import net.runelite.api.events.VarbitChanged;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.config.ChatColorConfig;
 import net.runelite.client.eventbus.Subscribe;

RuneLitePlus/src/main/java/net/runelite/client/chat/CommandManager.java

@@ -25,17 +25,17 @@
  */
 package net.runelite.client.chat;
 
+import api.Client;
+import api.ScriptID;
+import api.VarClientStr;
+import api.events.CommandExecuted;
+import api.events.ScriptCallbackEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Client;
-import net.runelite.api.ScriptID;
-import net.runelite.api.VarClientStr;
-import net.runelite.api.events.CommandExecuted;
-import net.runelite.api.events.ScriptCallbackEvent;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.eventbus.Subscribe;

RuneLitePlus/src/main/java/net/runelite/client/chat/QueuedMessage.java

@@ -24,10 +24,10 @@
  */
 package net.runelite.client.chat;
 
+import api.ChatMessageType;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NonNull;
-import net.runelite.api.ChatMessageType;
 
 @Data
 @Builder

RuneLitePlus/src/main/java/net/runelite/client/config/ConfigManager.java

@@ -24,6 +24,8 @@
  */
 package net.runelite.client.config;
 
+import api.coords.WorldPoint;
+import api.events.ConfigChanged;
 import com.google.common.base.Strings;
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.ImmutableMap;
@@ -59,8 +61,6 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.coords.WorldPoint;
-import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.RuneLite;
 import static net.runelite.client.RuneLite.PROFILES_DIR;
 import net.runelite.client.eventbus.EventBus;

RuneLitePlus/src/main/java/net/runelite/client/config/RuneLiteConfig.java

@@ -24,8 +24,8 @@
  */
 package net.runelite.client.config;
 
+import api.config.Constants;
 import java.awt.Dimension;
-import net.runelite.api.Constants;
 
 @ConfigGroup("runelite")
 public interface RuneLiteConfig extends Config

RuneLitePlus/src/main/java/net/runelite/client/events/NpcLootReceived.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.client.events;
 
+import api.NPC;
 import java.util.Collection;
 import lombok.Value;
-import net.runelite.api.NPC;
 import net.runelite.client.game.ItemStack;
 
 @Value

RuneLitePlus/src/main/java/net/runelite/client/events/PlayerLootReceived.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.client.events;
 
+import api.Player;
 import java.util.Collection;
 import lombok.Value;
-import net.runelite.api.Player;
 import net.runelite.client.game.ItemStack;
 
 @Value

RuneLitePlus/src/main/java/net/runelite/client/game/AgilityShortcut.java

@@ -25,214 +25,10 @@
  */
 package net.runelite.client.game;
 
+import static api.NullObjectID.*;
+import static api.ObjectID.*;
+import api.coords.WorldPoint;
 import lombok.Getter;
-import static net.runelite.api.NullObjectID.NULL_25337;
-import static net.runelite.api.NullObjectID.NULL_26371;
-import static net.runelite.api.NullObjectID.NULL_26375;
-import static net.runelite.api.NullObjectID.NULL_26884;
-import static net.runelite.api.NullObjectID.NULL_26886;
-import static net.runelite.api.NullObjectID.NULL_29868;
-import static net.runelite.api.NullObjectID.NULL_29869;
-import static net.runelite.api.NullObjectID.NULL_29870;
-import static net.runelite.api.NullObjectID.NULL_31823;
-import static net.runelite.api.NullObjectID.NULL_31849;
-import static net.runelite.api.NullObjectID.NULL_33327;
-import static net.runelite.api.NullObjectID.NULL_33328;
-import static net.runelite.api.ObjectID.A_WOODEN_LOG;
-import static net.runelite.api.ObjectID.BALANCING_LEDGE_23548;
-import static net.runelite.api.ObjectID.BIG_WINDOW;
-import static net.runelite.api.ObjectID.BOULDER_27990;
-import static net.runelite.api.ObjectID.BROKEN_FENCE;
-import static net.runelite.api.ObjectID.BROKEN_FENCE_2618;
-import static net.runelite.api.ObjectID.BROKEN_RAFT;
-import static net.runelite.api.ObjectID.BROKEN_WALL_33344;
-import static net.runelite.api.ObjectID.CASTLE_WALL;
-import static net.runelite.api.ObjectID.CLIMBING_ROCKS;
-import static net.runelite.api.ObjectID.CLIMBING_ROCKS_11948;
-import static net.runelite.api.ObjectID.CLIMBING_ROCKS_11949;
-import static net.runelite.api.ObjectID.CREVICE_16465;
-import static net.runelite.api.ObjectID.CREVICE_16539;
-import static net.runelite.api.ObjectID.CREVICE_16543;
-import static net.runelite.api.ObjectID.CREVICE_19043;
-import static net.runelite.api.ObjectID.CREVICE_30198;
-import static net.runelite.api.ObjectID.CREVICE_9739;
-import static net.runelite.api.ObjectID.CREVICE_9740;
-import static net.runelite.api.ObjectID.CROSSBOW_TREE_17062;
-import static net.runelite.api.ObjectID.CRUMBLING_WALL_24222;
-import static net.runelite.api.ObjectID.DARK_TUNNEL_10047;
-import static net.runelite.api.ObjectID.DENSE_FOREST;
-import static net.runelite.api.ObjectID.DENSE_FOREST_3938;
-import static net.runelite.api.ObjectID.DENSE_FOREST_3939;
-import static net.runelite.api.ObjectID.DENSE_FOREST_3998;
-import static net.runelite.api.ObjectID.DENSE_FOREST_3999;
-import static net.runelite.api.ObjectID.FALLEN_TREE_33192;
-import static net.runelite.api.ObjectID.FENCE_16518;
-import static net.runelite.api.ObjectID.GAP;
-import static net.runelite.api.ObjectID.GAP_2831;
-import static net.runelite.api.ObjectID.GAP_29326;
-import static net.runelite.api.ObjectID.HOLE_16520;
-import static net.runelite.api.ObjectID.HOLE_30966;
-import static net.runelite.api.ObjectID.HOLE_31481;
-import static net.runelite.api.ObjectID.HOLE_31482;
-import static net.runelite.api.ObjectID.ICE_CHUNKS_31822;
-import static net.runelite.api.ObjectID.ICE_CHUNKS_31990;
-import static net.runelite.api.ObjectID.JUTTING_WALL_17002;
-import static net.runelite.api.ObjectID.LADDER_30938;
-import static net.runelite.api.ObjectID.LADDER_30939;
-import static net.runelite.api.ObjectID.LADDER_30940;
-import static net.runelite.api.ObjectID.LADDER_30941;
-import static net.runelite.api.ObjectID.LEAVES;
-import static net.runelite.api.ObjectID.LEAVES_3924;
-import static net.runelite.api.ObjectID.LEAVES_3925;
-import static net.runelite.api.ObjectID.LEDGE_33190;
-import static net.runelite.api.ObjectID.LITTLE_BOULDER;
-import static net.runelite.api.ObjectID.LOG_BALANCE_16540;
-import static net.runelite.api.ObjectID.LOG_BALANCE_16541;
-import static net.runelite.api.ObjectID.LOG_BALANCE_16542;
-import static net.runelite.api.ObjectID.LOG_BALANCE_16546;
-import static net.runelite.api.ObjectID.LOG_BALANCE_16547;
-import static net.runelite.api.ObjectID.LOG_BALANCE_16548;
-import static net.runelite.api.ObjectID.LOG_BALANCE_20882;
-import static net.runelite.api.ObjectID.LOG_BALANCE_20884;
-import static net.runelite.api.ObjectID.LOG_BALANCE_23274;
-import static net.runelite.api.ObjectID.LOG_BALANCE_3929;
-import static net.runelite.api.ObjectID.LOG_BALANCE_3930;
-import static net.runelite.api.ObjectID.LOG_BALANCE_3931;
-import static net.runelite.api.ObjectID.LOG_BALANCE_3932;
-import static net.runelite.api.ObjectID.LOG_BALANCE_3933;
-import static net.runelite.api.ObjectID.LOOSE_RAILING;
-import static net.runelite.api.ObjectID.LOOSE_RAILING_2186;
-import static net.runelite.api.ObjectID.LOOSE_RAILING_28849;
-import static net.runelite.api.ObjectID.LOW_FENCE;
-import static net.runelite.api.ObjectID.MONKEYBARS_23566;
-import static net.runelite.api.ObjectID.MONKEYBARS_23567;
-import static net.runelite.api.ObjectID.MYSTERIOUS_PIPE;
-import static net.runelite.api.ObjectID.OBSTACLE;
-import static net.runelite.api.ObjectID.OBSTACLE_30767;
-import static net.runelite.api.ObjectID.OBSTACLE_30962;
-import static net.runelite.api.ObjectID.OBSTACLE_30964;
-import static net.runelite.api.ObjectID.OBSTACLE_PIPE_16509;
-import static net.runelite.api.ObjectID.OBSTACLE_PIPE_16511;
-import static net.runelite.api.ObjectID.OBSTACLE_PIPE_23140;
-import static net.runelite.api.ObjectID.ORNATE_RAILING;
-import static net.runelite.api.ObjectID.ORNATE_RAILING_17000;
-import static net.runelite.api.ObjectID.PILE_OF_RUBBLE_23563;
-import static net.runelite.api.ObjectID.PILE_OF_RUBBLE_23564;
-import static net.runelite.api.ObjectID.PILLAR_31561;
-import static net.runelite.api.ObjectID.PILLAR_31809;
-import static net.runelite.api.ObjectID.PIPE_21727;
-import static net.runelite.api.ObjectID.PIPE_21728;
-import static net.runelite.api.ObjectID.ROCKS;
-import static net.runelite.api.ObjectID.ROCKSLIDE_33184;
-import static net.runelite.api.ObjectID.ROCKSLIDE_33185;
-import static net.runelite.api.ObjectID.ROCKSLIDE_33191;
-import static net.runelite.api.ObjectID.ROCKS_14106;
-import static net.runelite.api.ObjectID.ROCKS_16464;
-import static net.runelite.api.ObjectID.ROCKS_16514;
-import static net.runelite.api.ObjectID.ROCKS_16515;
-import static net.runelite.api.ObjectID.ROCKS_16521;
-import static net.runelite.api.ObjectID.ROCKS_16522;
-import static net.runelite.api.ObjectID.ROCKS_16523;
-import static net.runelite.api.ObjectID.ROCKS_16524;
-import static net.runelite.api.ObjectID.ROCKS_16534;
-import static net.runelite.api.ObjectID.ROCKS_16535;
-import static net.runelite.api.ObjectID.ROCKS_16545;
-import static net.runelite.api.ObjectID.ROCKS_16549;
-import static net.runelite.api.ObjectID.ROCKS_16550;
-import static net.runelite.api.ObjectID.ROCKS_16998;
-import static net.runelite.api.ObjectID.ROCKS_16999;
-import static net.runelite.api.ObjectID.ROCKS_17042;
-import static net.runelite.api.ObjectID.ROCKS_19849;
-import static net.runelite.api.ObjectID.ROCKS_2231;
-import static net.runelite.api.ObjectID.ROCKS_27984;
-import static net.runelite.api.ObjectID.ROCKS_27985;
-import static net.runelite.api.ObjectID.ROCKS_27987;
-import static net.runelite.api.ObjectID.ROCKS_27988;
-import static net.runelite.api.ObjectID.ROCKS_31757;
-import static net.runelite.api.ObjectID.ROCKS_31758;
-import static net.runelite.api.ObjectID.ROCKS_31759;
-import static net.runelite.api.ObjectID.ROCKS_34396;
-import static net.runelite.api.ObjectID.ROCKS_34397;
-import static net.runelite.api.ObjectID.ROCKS_34741;
-import static net.runelite.api.ObjectID.ROCKS_3748;
-import static net.runelite.api.ObjectID.ROCKS_3790;
-import static net.runelite.api.ObjectID.ROCKS_3791;
-import static net.runelite.api.ObjectID.ROCKS_3803;
-import static net.runelite.api.ObjectID.ROCKS_3804;
-import static net.runelite.api.ObjectID.ROCKS_6673;
-import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26400;
-import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26401;
-import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26402;
-import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26404;
-import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26405;
-import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26406;
-import static net.runelite.api.ObjectID.ROCK_16115;
-import static net.runelite.api.ObjectID.ROPESWING_23568;
-import static net.runelite.api.ObjectID.ROPESWING_23569;
-import static net.runelite.api.ObjectID.ROPE_ANCHOR;
-import static net.runelite.api.ObjectID.ROPE_ANCHOR_30917;
-import static net.runelite.api.ObjectID.ROPE_BRIDGE_21306;
-import static net.runelite.api.ObjectID.ROPE_BRIDGE_21307;
-import static net.runelite.api.ObjectID.ROPE_BRIDGE_21308;
-import static net.runelite.api.ObjectID.ROPE_BRIDGE_21309;
-import static net.runelite.api.ObjectID.ROPE_BRIDGE_21310;
-import static net.runelite.api.ObjectID.ROPE_BRIDGE_21311;
-import static net.runelite.api.ObjectID.ROPE_BRIDGE_21312;
-import static net.runelite.api.ObjectID.ROPE_BRIDGE_21313;
-import static net.runelite.api.ObjectID.ROPE_BRIDGE_21314;
-import static net.runelite.api.ObjectID.ROPE_BRIDGE_21315;
-import static net.runelite.api.ObjectID.RUBBER_CAP_MUSHROOM;
-import static net.runelite.api.ObjectID.SPIKEY_CHAIN;
-import static net.runelite.api.ObjectID.SPIKEY_CHAIN_16538;
-import static net.runelite.api.ObjectID.STAIRS_31485;
-import static net.runelite.api.ObjectID.STEPPING_STONES;
-import static net.runelite.api.ObjectID.STEPPING_STONES_23646;
-import static net.runelite.api.ObjectID.STEPPING_STONES_23647;
-import static net.runelite.api.ObjectID.STEPPING_STONE_10663;
-import static net.runelite.api.ObjectID.STEPPING_STONE_11768;
-import static net.runelite.api.ObjectID.STEPPING_STONE_13504;
-import static net.runelite.api.ObjectID.STEPPING_STONE_14917;
-import static net.runelite.api.ObjectID.STEPPING_STONE_14918;
-import static net.runelite.api.ObjectID.STEPPING_STONE_16466;
-import static net.runelite.api.ObjectID.STEPPING_STONE_16513;
-import static net.runelite.api.ObjectID.STEPPING_STONE_16533;
-import static net.runelite.api.ObjectID.STEPPING_STONE_19040;
-import static net.runelite.api.ObjectID.STEPPING_STONE_19042;
-import static net.runelite.api.ObjectID.STEPPING_STONE_21738;
-import static net.runelite.api.ObjectID.STEPPING_STONE_21739;
-import static net.runelite.api.ObjectID.STEPPING_STONE_29728;
-import static net.runelite.api.ObjectID.STEPPING_STONE_29729;
-import static net.runelite.api.ObjectID.STEPPING_STONE_29730;
-import static net.runelite.api.ObjectID.STEPPING_STONE_5948;
-import static net.runelite.api.ObjectID.STEPPING_STONE_5949;
-import static net.runelite.api.ObjectID.STEPS;
-import static net.runelite.api.ObjectID.STEPS_29993;
-import static net.runelite.api.ObjectID.STICKS;
-import static net.runelite.api.ObjectID.STILE;
-import static net.runelite.api.ObjectID.STILE_12982;
-import static net.runelite.api.ObjectID.STRANGE_FLOOR;
-import static net.runelite.api.ObjectID.STRANGE_FLOOR_16544;
-import static net.runelite.api.ObjectID.STRONG_TREE_17074;
-import static net.runelite.api.ObjectID.TIGHTGAP;
-import static net.runelite.api.ObjectID.TRELLIS_20056;
-import static net.runelite.api.ObjectID.TRIPWIRE;
-import static net.runelite.api.ObjectID.TUNNEL_30174;
-import static net.runelite.api.ObjectID.TUNNEL_30175;
-import static net.runelite.api.ObjectID.TUNNEL_30959;
-import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL;
-import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL_16528;
-import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL_16529;
-import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL_16530;
-import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL_19032;
-import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL_19036;
-import static net.runelite.api.ObjectID.VINE_26880;
-import static net.runelite.api.ObjectID.VINE_26882;
-import static net.runelite.api.ObjectID.WALL_17047;
-import static net.runelite.api.ObjectID.WALL_17049;
-import static net.runelite.api.ObjectID.WALL_17050;
-import static net.runelite.api.ObjectID.WEATHERED_WALL;
-import static net.runelite.api.ObjectID.WEATHERED_WALL_16526;
-import net.runelite.api.coords.WorldPoint;
 
 @Getter
 public enum AgilityShortcut

RuneLitePlus/src/main/java/net/runelite/client/game/ClanManager.java

@@ -24,6 +24,14 @@
  */
 package net.runelite.client.game;
 
+import api.ClanMember;
+import api.ClanMemberRank;
+import api.Client;
+import api.GameState;
+import api.IndexedSprite;
+import api.SpriteID;
+import api.events.ClanChanged;
+import api.events.GameStateChanged;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -36,14 +44,6 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import net.runelite.api.ClanMember;
-import net.runelite.api.ClanMemberRank;
-import net.runelite.api.Client;
-import net.runelite.api.GameState;
-import net.runelite.api.IndexedSprite;
-import net.runelite.api.SpriteID;
-import net.runelite.api.events.ClanChanged;
-import net.runelite.api.events.GameStateChanged;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.util.ImageUtil;
 import net.runelite.client.util.Text;

RuneLitePlus/src/main/java/net/runelite/client/game/HiscoreManager.java

@@ -24,6 +24,7 @@
  */
 package net.runelite.client.game;
 
+import api.Client;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.LoadingCache;
 import java.io.IOException;
@@ -33,7 +34,6 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import net.runelite.api.Client;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.http.api.hiscore.HiscoreClient;
 import net.runelite.http.api.hiscore.HiscoreEndpoint;

RuneLitePlus/src/main/java/net/runelite/client/game/ItemManager.java

@@ -24,6 +24,16 @@
  */
 package net.runelite.client.game;
 
+import api.Client;
+import static api.Constants.CLIENT_DEFAULT_ZOOM;
+import static api.Constants.HIGH_ALCHEMY_CONSTANT;
+import api.GameState;
+import api.ItemDefinition;
+import api.ItemID;
+import static api.ItemID.*;
+import api.Sprite;
+import api.events.GameStateChanged;
+import api.events.PostItemDefinition;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -43,125 +53,6 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Client;
-import static net.runelite.api.Constants.CLIENT_DEFAULT_ZOOM;
-import static net.runelite.api.Constants.HIGH_ALCHEMY_CONSTANT;
-import net.runelite.api.GameState;
-import net.runelite.api.ItemComposition;
-import net.runelite.api.ItemID;
-import static net.runelite.api.ItemID.AGILITY_CAPE;
-import static net.runelite.api.ItemID.AGILITY_CAPET;
-import static net.runelite.api.ItemID.AGILITY_CAPET_13341;
-import static net.runelite.api.ItemID.AGILITY_CAPE_13340;
-import static net.runelite.api.ItemID.BOOTS_OF_LIGHTNESS;
-import static net.runelite.api.ItemID.BOOTS_OF_LIGHTNESS_89;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_11861;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13589;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13590;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13601;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13602;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13613;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13614;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13625;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13626;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13637;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13638;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13677;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_13678;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_21076;
-import static net.runelite.api.ItemID.GRACEFUL_BOOTS_21078;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_11853;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13581;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13582;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13593;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13594;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13605;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13606;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13617;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13618;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13629;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13630;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13669;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_13670;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_21064;
-import static net.runelite.api.ItemID.GRACEFUL_CAPE_21066;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_11859;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13587;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13588;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13599;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13600;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13611;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13612;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13623;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13624;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13635;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13636;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13675;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_13676;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_21073;
-import static net.runelite.api.ItemID.GRACEFUL_GLOVES_21075;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_11851;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13579;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13580;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13591;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13592;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13603;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13604;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13615;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13616;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13627;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13628;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13667;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_13668;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_21061;
-import static net.runelite.api.ItemID.GRACEFUL_HOOD_21063;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_11857;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13585;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13586;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13597;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13598;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13609;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13610;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13621;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13622;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13633;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13634;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13673;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_13674;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_21070;
-import static net.runelite.api.ItemID.GRACEFUL_LEGS_21072;
-import static net.runelite.api.ItemID.GRACEFUL_TOP;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_11855;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13583;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13584;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13595;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13596;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13607;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13608;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13619;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13620;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13631;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13632;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13671;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_13672;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_21067;
-import static net.runelite.api.ItemID.GRACEFUL_TOP_21069;
-import static net.runelite.api.ItemID.MAX_CAPE;
-import static net.runelite.api.ItemID.MAX_CAPE_13342;
-import static net.runelite.api.ItemID.PENANCE_GLOVES;
-import static net.runelite.api.ItemID.PENANCE_GLOVES_10554;
-import static net.runelite.api.ItemID.SPOTTED_CAPE;
-import static net.runelite.api.ItemID.SPOTTED_CAPE_10073;
-import static net.runelite.api.ItemID.SPOTTIER_CAPE;
-import static net.runelite.api.ItemID.SPOTTIER_CAPE_10074;
-import net.runelite.api.SpritePixels;
-import net.runelite.api.events.GameStateChanged;
-import net.runelite.api.events.PostItemComposition;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.http.api.item.ItemClient;
@@ -196,7 +87,7 @@ public class ItemManager
 	private Map<Integer, ItemPrice> itemPrices = Collections.emptyMap();
 	private Map<Integer, ItemStats> itemStats = Collections.emptyMap();
 	private final LoadingCache<ImageKey, AsyncBufferedImage> itemImages;
-	private final LoadingCache<Integer, ItemComposition> itemCompositions;
+	private final LoadingCache<Integer, ItemDefinition> itemDefinitions;
 	private final LoadingCache<OutlineKey, BufferedImage> itemOutlines;
 
 	// Worn items with weight reducing property have a different worn and inventory ItemID
@@ -284,13 +175,13 @@ public class ItemManager
 				}
 			});
 
-		itemCompositions = CacheBuilder.newBuilder()
+		itemDefinitions = CacheBuilder.newBuilder()
 			.maximumSize(1024L)
 			.expireAfterAccess(1, TimeUnit.HOURS)
-			.build(new CacheLoader<Integer, ItemComposition>()
+			.build(new CacheLoader<Integer, ItemDefinition>()
 			{
 				@Override
-				public ItemComposition load(Integer key) throws Exception
+				public ItemDefinition load(Integer key) throws Exception
 				{
 					return client.getItemDefinition(key);
 				}
@@ -356,24 +247,24 @@ public class ItemManager
 	{
 		if (event.getGameState() == GameState.HOPPING || event.getGameState() == GameState.LOGIN_SCREEN)
 		{
-			itemCompositions.invalidateAll();
+			itemDefinitions.invalidateAll();
 		}
 	}
 
 	@Subscribe
-	public void onPostItemComposition(PostItemComposition event)
+	public void onPostItemDefinition(PostItemDefinition event)
 	{
-		itemCompositions.put(event.getItemComposition().getId(), event.getItemComposition());
+		itemDefinitions.put(event.getItemDefinition().getId(), event.getItemDefinition());
 	}
 
 	/**
 	 * Invalidates internal item manager item composition cache (but not client item composition cache)
 	 *
-	 * @see Client#getItemCompositionCache()
+	 * @see Client#getItemDefinitionCache()
 	 */
-	public void invalidateItemCompositionCache()
+	public void invalidateItemDefinitionCache()
 	{
-		itemCompositions.invalidateAll();
+		itemDefinitions.invalidateAll();
 	}
 
 	/**
@@ -412,7 +303,7 @@ public class ItemManager
 		return price;
 	}
 
-	public int getAlchValue(ItemComposition composition)
+	public int getAlchValue(ItemDefinition composition)
 	{
 		if (composition.getId() == ItemID.COINS_995)
 		{
@@ -437,7 +328,7 @@ public class ItemManager
 			return 1000;
 		}
 
-		return (int) Math.max(1, getItemComposition(itemID).getPrice() * HIGH_ALCHEMY_CONSTANT);
+		return (int) Math.max(1, getItemDefinition(itemID).getPrice() * HIGH_ALCHEMY_CONSTANT);
 	}
 
 	/**
@@ -449,7 +340,7 @@ public class ItemManager
 	@Nullable
 	public ItemStats getItemStats(int itemId, boolean allowNote)
 	{
-		ItemComposition itemComposition = getItemComposition(itemId);
+		ItemDefinition itemComposition = getItemDefinition(itemId);
 
 		if (itemComposition == null || itemComposition.getName() == null || (!allowNote && itemComposition.getNote() != -1))
 		{
@@ -487,10 +378,10 @@ public class ItemManager
 	 * @param itemId item id
 	 * @return item composition
 	 */
-	public ItemComposition getItemComposition(int itemId)
+	public ItemDefinition getItemDefinition(int itemId)
 	{
-		assert client.isClientThread() : "getItemComposition must be called on client thread";
+		assert client.isClientThread() : "getItemDefinition must be called on client thread";
-		return itemCompositions.getUnchecked(itemId);
+		return itemDefinitions.getUnchecked(itemId);
 	}
 
 	/**
@@ -498,7 +389,7 @@ public class ItemManager
 	 */
 	public int canonicalize(int itemID)
 	{
-		ItemComposition itemComposition = getItemComposition(itemID);
+		ItemDefinition itemComposition = getItemDefinition(itemID);
 
 		if (itemComposition.getNote() != -1)
 		{
@@ -528,7 +419,7 @@ public class ItemManager
 			{
 				return false;
 			}
-			SpritePixels sprite = client.createItemSprite(itemId, quantity, 1, SpritePixels.DEFAULT_SHADOW_COLOR,
+			Sprite sprite = client.createItemSprite(itemId, quantity, 1, Sprite.DEFAULT_SHADOW_COLOR,
 				stackable ? 1 : 0, false, CLIENT_DEFAULT_ZOOM);
 			if (sprite == null)
 			{
@@ -589,7 +480,7 @@ public class ItemManager
 	 */
 	private BufferedImage loadItemOutline(final int itemId, final int itemQuantity, final Color outlineColor)
 	{
-		final SpritePixels itemSprite = client.createItemSprite(itemId, itemQuantity, 1, 0, 0, true, 710);
+		final Sprite itemSprite = client.createItemSprite(itemId, itemQuantity, 1, 0, 0, true, 710);
 		return itemSprite.toBufferedOutline(outlineColor);
 	}
 

RuneLitePlus/src/main/java/net/runelite/client/game/ItemMapping.java

@@ -25,11 +25,11 @@
  */
 package net.runelite.client.game;
 
+import static api.ItemID.*;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import java.util.Collection;
 import java.util.Collections;
-import static net.runelite.api.ItemID.*;
 
 /**
  * Converts untradeable items to it's tradeable counterparts

RuneLitePlus/src/main/java/net/runelite/client/game/ItemStack.java

@@ -24,8 +24,8 @@
  */
 package net.runelite.client.game;
 
+import api.coords.LocalPoint;
 import lombok.Value;
-import net.runelite.api.coords.LocalPoint;
 
 @Value
 public class ItemStack

RuneLitePlus/src/main/java/net/runelite/client/game/LootManager.java

@@ -24,6 +24,23 @@
  */
 package net.runelite.client.game;
 
+import api.AnimationID;
+import api.Client;
+import api.Item;
+import api.ItemID;
+import api.NPC;
+import api.NpcID;
+import api.Player;
+import api.Tile;
+import api.coords.LocalPoint;
+import api.coords.WorldPoint;
+import api.events.AnimationChanged;
+import api.events.GameTick;
+import api.events.ItemDespawned;
+import api.events.ItemQuantityChanged;
+import api.events.ItemSpawned;
+import api.events.NpcDespawned;
+import api.events.PlayerDespawned;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ListMultimap;
@@ -36,23 +53,6 @@ import java.util.Set;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.AnimationID;
-import net.runelite.api.Client;
-import net.runelite.api.Item;
-import net.runelite.api.ItemID;
-import net.runelite.api.NPC;
-import net.runelite.api.NpcID;
-import net.runelite.api.Player;
-import net.runelite.api.Tile;
-import net.runelite.api.coords.LocalPoint;
-import net.runelite.api.coords.WorldPoint;
-import net.runelite.api.events.AnimationChanged;
-import net.runelite.api.events.GameTick;
-import net.runelite.api.events.ItemDespawned;
-import net.runelite.api.events.ItemQuantityChanged;
-import net.runelite.api.events.ItemSpawned;
-import net.runelite.api.events.NpcDespawned;
-import net.runelite.api.events.PlayerDespawned;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.events.NpcLootReceived;
@@ -237,7 +237,7 @@ public class LootManager
 
 		final int x = location.getSceneX();
 		final int y = location.getSceneY();
-		final int size = npc.getComposition().getSize();
+		final int size = npc.getDefinition().getSize();
 
 		// Some NPCs drop items onto multiple tiles
 		final List<ItemStack> allItems = new ArrayList<>();

RuneLitePlus/src/main/java/net/runelite/client/game/SkillIconManager.java

@@ -24,10 +24,10 @@
  */
 package net.runelite.client.game;
 
+import api.Skill;
 import java.awt.image.BufferedImage;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Skill;
 import net.runelite.client.util.ImageUtil;
 
 @Singleton

RuneLitePlus/src/main/java/net/runelite/client/game/SpriteManager.java

@@ -24,6 +24,9 @@
  */
 package net.runelite.client.game;
 
+import api.Client;
+import api.GameState;
+import api.Sprite;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.inject.Inject;
@@ -38,9 +41,6 @@ import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.SwingUtilities;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Client;
-import net.runelite.api.GameState;
-import net.runelite.api.SpritePixels;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.util.ImageUtil;
 
@@ -75,7 +75,7 @@ public class SpriteManager
 			return cached;
 		}
 
-		SpritePixels[] sp = client.getSprites(client.getIndexSprites(), archive, 0);
+		Sprite[] sp = client.getSprites(client.getIndexSprites(), archive, 0);
 		BufferedImage img = sp[file].toBufferedImage();
 
 		cache.put(key, img);
@@ -141,12 +141,12 @@ public class SpriteManager
 
 		clientThread.invokeLater(() ->
 		{
-			Map<Integer, SpritePixels> overrides = client.getSpriteOverrides();
+			Map<Integer, Sprite> overrides = client.getSpriteOverrides();
 			Class<?> owner = add[0].getClass();
 			for (SpriteOverride o : add)
 			{
 				BufferedImage image = ImageUtil.getResourceStreamFromClass(owner, o.getFileName());
-				SpritePixels sp = ImageUtil.getImageSpritePixels(image, client);
+				Sprite sp = ImageUtil.getImageSpritePixels(image, client);
 				overrides.put(o.getSpriteId(), sp);
 			}
 		});
@@ -156,7 +156,7 @@ public class SpriteManager
 	{
 		clientThread.invokeLater(() ->
 		{
-			Map<Integer, SpritePixels> overrides = client.getSpriteOverrides();
+			Map<Integer, Sprite> overrides = client.getSpriteOverrides();
 			for (SpriteOverride o : remove)
 			{
 				overrides.remove(o.getSpriteId());

RuneLitePlus/src/main/java/net/runelite/client/game/SpriteOverride.java

@@ -24,14 +24,13 @@
  */
 package net.runelite.client.game;
 
-import net.runelite.api.SpriteID;
 
 public interface SpriteOverride
 {
 	/**
 	 * An ID for a sprite. Negative numbers are used by RuneLite specific sprites
 	 *
-	 * @see SpriteID
+	 * @see api.SpriteID
 	 */
 	int getSpriteId();
 

RuneLitePlus/src/main/java/net/runelite/client/game/UntradeableItemMapping.java

@@ -24,10 +24,10 @@
  */
 package net.runelite.client.game;
 
+import api.ItemID;
 import com.google.common.collect.ImmutableMap;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import net.runelite.api.ItemID;
 
 @Getter
 @RequiredArgsConstructor

RuneLitePlus/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java

@@ -24,21 +24,21 @@
  */
 package net.runelite.client.game.chatbox;
 
+import api.Client;
+import api.GameState;
+import api.ScriptID;
+import api.VarClientInt;
+import api.events.GameStateChanged;
+import api.events.ScriptCallbackEvent;
+import api.vars.InputType;
+import api.widgets.JavaScriptCallback;
+import api.widgets.Widget;
+import api.widgets.WidgetInfo;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Client;
-import net.runelite.api.GameState;
-import net.runelite.api.ScriptID;
-import net.runelite.api.VarClientInt;
-import net.runelite.api.events.GameStateChanged;
-import net.runelite.api.events.ScriptCallbackEvent;
-import net.runelite.api.vars.InputType;
-import net.runelite.api.widgets.JavaScriptCallback;
-import net.runelite.api.widgets.Widget;
-import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.eventbus.Subscribe;

RuneLitePlus/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java

@@ -24,6 +24,14 @@
  */
 package net.runelite.client.game.chatbox;
 
+import api.FontID;
+import api.FontTypeFace;
+import api.widgets.JavaScriptCallback;
+import api.widgets.Widget;
+import api.widgets.WidgetPositionMode;
+import api.widgets.WidgetSizeMode;
+import api.widgets.WidgetTextAlignment;
+import api.widgets.WidgetType;
 import com.google.common.base.Strings;
 import com.google.inject.Inject;
 import java.awt.Point;
@@ -46,14 +54,6 @@ import javax.swing.SwingUtilities;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.FontID;
-import net.runelite.api.FontTypeFace;
-import net.runelite.api.widgets.JavaScriptCallback;
-import net.runelite.api.widgets.Widget;
-import net.runelite.api.widgets.WidgetPositionMode;
-import net.runelite.api.widgets.WidgetSizeMode;
-import net.runelite.api.widgets.WidgetTextAlignment;
-import net.runelite.api.widgets.WidgetType;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.input.KeyListener;
 import net.runelite.client.input.MouseListener;
@@ -439,7 +439,7 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse
 			y += h;
 		}
 
-		net.runelite.api.Point ccl = container.getCanvasLocation();
+		api.Point ccl = container.getCanvasLocation();
 
 		isInBounds = ev -> bounds.contains(new Point(ev.getX() - ccl.getX(), ev.getY() - ccl.getY()));
 		getPointCharOffset = p ->

RuneLitePlus/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java

@@ -24,6 +24,13 @@
  */
 package net.runelite.client.game.chatbox;
 
+import api.FontID;
+import api.widgets.JavaScriptCallback;
+import api.widgets.Widget;
+import api.widgets.WidgetPositionMode;
+import api.widgets.WidgetSizeMode;
+import api.widgets.WidgetTextAlignment;
+import api.widgets.WidgetType;
 import com.google.inject.Inject;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
@@ -32,13 +39,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.FontID;
-import net.runelite.api.widgets.JavaScriptCallback;
-import net.runelite.api.widgets.Widget;
-import net.runelite.api.widgets.WidgetPositionMode;
-import net.runelite.api.widgets.WidgetSizeMode;
-import net.runelite.api.widgets.WidgetTextAlignment;
-import net.runelite.api.widgets.WidgetType;
 import net.runelite.client.input.KeyListener;
 
 @Slf4j

RuneLitePlus/src/main/java/net/runelite/client/graphics/ModelOutlineRenderer.java

@@ -24,6 +24,14 @@
  */
 package net.runelite.client.graphics;
 
+import api.Client;
+import api.MainBufferProvider;
+import api.Model;
+import api.NPC;
+import api.NPCDefinition;
+import api.Perspective;
+import api.Player;
+import api.coords.LocalPoint;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import java.awt.Color;
@@ -33,14 +41,6 @@ import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import net.runelite.api.Client;
-import net.runelite.api.MainBufferProvider;
-import net.runelite.api.Model;
-import net.runelite.api.NPC;
-import net.runelite.api.NPCComposition;
-import net.runelite.api.Perspective;
-import net.runelite.api.Player;
-import net.runelite.api.coords.LocalPoint;
 import net.runelite.client.task.Schedule;
 
 @Singleton
@@ -934,7 +934,7 @@ public class ModelOutlineRenderer
 							Color innerColor, Color outerColor)
 	{
 		int size = 1;
-		NPCComposition composition = npc.getTransformedComposition();
+		NPCDefinition composition = npc.getTransformedDefinition();
 		if (composition != null)
 		{
 			size = composition.getSize();