Re-write to use Intellij's PSI (via kotlin-compiler) instead of ECJ

Primarily for potential kotlin support.
Secondarily, this allows us to drop the EPL (kotlin-compiler is ASL2.0).

This also fixes an issue where redirect/inject methods with names
identical to remapped names in the target class would get renamed.

This also seems to implement the implicit member reference check (to
prevent accidental name shadowing after remapping) more thoroughly, at
least it finds some valid cases which the previous implementation has
ignored.

6 files changed, 1137 insertions, 745 deletions

diff --git a/EPL-2.0.txt b/EPL-2.0.txt
deleted file mode 100644
index e23ece2..0000000
--- a/EPL-2.0.txt
+++ /dev/null
@@ -1,277 +0,0 @@
-Eclipse Public License - v 2.0
-
-    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-  a) in the case of the initial Contributor, the initial content
-     Distributed under this Agreement, and
-
-  b) in the case of each subsequent Contributor:
-     i) changes to the Program, and
-     ii) additions to the Program;
-  where such changes and/or additions to the Program originate from
-  and are Distributed by that particular Contributor. A Contribution
-  "originates" from a Contributor if it was added to the Program by
-  such Contributor itself or anyone acting on such Contributor's behalf.
-  Contributions do not include changes or additions to the Program that
-  are not Modified Works.
-
-"Contributor" means any person or entity that Distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which
-are necessarily infringed by the use or sale of its Contribution alone
-or when combined with the Program.
-
-"Program" means the Contributions Distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement
-or any Secondary License (as applicable), including Contributors.
-
-"Derivative Works" shall mean any work, whether in Source Code or other
-form, that is based on (or derived from) the Program and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship.
-
-"Modified Works" shall mean any work in Source Code or other form that
-results from an addition to, deletion from, or modification of the
-contents of the Program, including, for purposes of clarity any new file
-in Source Code form that contains any contents of the Program. Modified
-Works shall not include works that contain only declarations,
-interfaces, types, classes, structures, or files of the Program solely
-in each case in order to link to, bind by name, or subclass the Program
-or Modified Works thereof.
-
-"Distribute" means the acts of a) distributing or b) making available
-in any manner that enables the transfer of a copy.
-
-"Source Code" means the form of a Program preferred for making
-modifications, including but not limited to software source code,
-documentation source, and configuration files.
-
-"Secondary License" means either the GNU General Public License,
-Version 2.0, or any later versions of that license, including any
-exceptions or additional permissions as identified by the initial
-Contributor.
-
-2. GRANT OF RIGHTS
-
-  a) Subject to the terms of this Agreement, each Contributor hereby
-  grants Recipient a non-exclusive, worldwide, royalty-free copyright
-  license to reproduce, prepare Derivative Works of, publicly display,
-  publicly perform, Distribute and sublicense the Contribution of such
-  Contributor, if any, and such Derivative Works.
-
-  b) Subject to the terms of this Agreement, each Contributor hereby
-  grants Recipient a non-exclusive, worldwide, royalty-free patent
-  license under Licensed Patents to make, use, sell, offer to sell,
-  import and otherwise transfer the Contribution of such Contributor,
-  if any, in Source Code or other form. This patent license shall
-  apply to the combination of the Contribution and the Program if, at
-  the time the Contribution is added by the Contributor, such addition
-  of the Contribution causes such combination to be covered by the
-  Licensed Patents. The patent license shall not apply to any other
-  combinations which include the Contribution. No hardware per se is
-  licensed hereunder.
-
-  c) Recipient understands that although each Contributor grants the
-  licenses to its Contributions set forth herein, no assurances are
-  provided by any Contributor that the Program does not infringe the
-  patent or other intellectual property rights of any other entity.
-  Each Contributor disclaims any liability to Recipient for claims
-  brought by any other entity based on infringement of intellectual
-  property rights or otherwise. As a condition to exercising the
-  rights and licenses granted hereunder, each Recipient hereby
-  assumes sole responsibility to secure any other intellectual
-  property rights needed, if any. For example, if a third party
-  patent license is required to allow Recipient to Distribute the
-  Program, it is Recipient's responsibility to acquire that license
-  before distributing the Program.
-
-  d) Each Contributor represents that to its knowledge it has
-  sufficient copyright rights in its Contribution, if any, to grant
-  the copyright license set forth in this Agreement.
-
-  e) Notwithstanding the terms of any Secondary License, no
-  Contributor makes additional grants to any Recipient (other than
-  those set forth in this Agreement) as a result of such Recipient's
-  receipt of the Program under the terms of a Secondary License
-  (if permitted under the terms of Section 3).
-
-3. REQUIREMENTS
-
-3.1 If a Contributor Distributes the Program in any form, then:
-
-  a) the Program must also be made available as Source Code, in
-  accordance with section 3.2, and the Contributor must accompany
-  the Program with a statement that the Source Code for the Program
-  is available under this Agreement, and informs Recipients how to
-  obtain it in a reasonable manner on or through a medium customarily
-  used for software exchange; and
-
-  b) the Contributor may Distribute the Program under a license
-  different than this Agreement, provided that such license:
-     i) effectively disclaims on behalf of all other Contributors all
-     warranties and conditions, express and implied, including
-     warranties or conditions of title and non-infringement, and
-     implied warranties or conditions of merchantability and fitness
-     for a particular purpose;
-
-     ii) effectively excludes on behalf of all other Contributors all
-     liability for damages, including direct, indirect, special,
-     incidental and consequential damages, such as lost profits;
-
-     iii) does not attempt to limit or alter the recipients' rights
-     in the Source Code under section 3.2; and
-
-     iv) requires any subsequent distribution of the Program by any
-     party to be under a license that satisfies the requirements
-     of this section 3.
-
-3.2 When the Program is Distributed as Source Code:
-
-  a) it must be made available under this Agreement, or if the
-  Program (i) is combined with other material in a separate file or
-  files made available under a Secondary License, and (ii) the initial
-  Contributor attached to the Source Code the notice described in
-  Exhibit A of this Agreement, then the Program may be made available
-  under the terms of such Secondary Licenses, and
-
-  b) a copy of this Agreement must be included with each copy of
-  the Program.
-
-3.3 Contributors may not remove or alter any copyright, patent,
-trademark, attribution notices, disclaimers of warranty, or limitations
-of liability ("notices") contained within the Program from any copy of
-the Program which they Distribute, provided that Contributors may add
-their own appropriate notices.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While this
-license is intended to facilitate the commercial use of the Program,
-the Contributor who includes the Program in a commercial product
-offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes
-the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and indemnify every
-other Contributor ("Indemnified Contributor") against any losses,
-damages and costs (collectively "Losses") arising from claims, lawsuits
-and other legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the Program
-in a commercial product offering. The obligations in this section do not
-apply to any claims or Losses relating to any actual or alleged
-intellectual property infringement. In order to qualify, an Indemnified
-Contributor must: a) promptly notify the Commercial Contributor in
-writing of such claim, and b) allow the Commercial Contributor to control,
-and cooperate with the Commercial Contributor in, the defense and any
-related settlement negotiations. The Indemnified Contributor may
-participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those performance
-claims and warranties, and if a court requires any other Contributor to
-pay any damages as a result, the Commercial Contributor must pay
-those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. Each Recipient is solely responsible for determining the
-appropriateness of using and distributing the Program and assumes all
-risks associated with its exercise of rights under this Agreement,
-including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs
-or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other software
-or hardware) infringes such Recipient's patent(s), then such Recipient's
-rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign the
-responsibility to serve as the Agreement Steward to a suitable separate
-entity. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be
-Distributed subject to the version of the Agreement under which it was
-received. In addition, after a new version of the Agreement is published,
-Contributor may elect to Distribute the Program (including its
-Contributions) under the new version.
-
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-receives no rights or licenses to the intellectual property of any
-Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted
-under this Agreement are reserved. Nothing in this Agreement is intended
-to be enforceable by any entity that is not a Contributor or Recipient.
-No third-party beneficiary rights are created under this Agreement.
-
-Exhibit A - Form of Secondary Licenses Notice
-
-"This Source Code may also be made available under the following 
-Secondary Licenses when the conditions for such availability set forth 
-in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-version(s), and exceptions or additional permissions here}."
-
-  Simply including a copy of this Agreement, including this Exhibit A
-  is not sufficient to license the Source Code under Secondary Licenses.
-
-  If it is not possible or desirable to put the notice in a particular
-  file, then You may include the notice in a location (such as a LICENSE
-  file in a relevant directory) where a recipient would be likely to
-  look for such a notice.
-
-  You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..2a99aee
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,675 @@
+### GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+### Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS
+
+#### 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+#### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+#### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+#### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+#### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+#### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+#### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+#### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+#### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+#### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+#### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+#### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+#### 13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+#### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+#### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+#### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+#### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 3 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+        <program>  Copyright (C) <year>  <name of author>
+        This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+        This is free software, and you are welcome to redistribute it
+        under certain conditions; type `show c' for details.
+
+The hypothetical commands \`show w' and \`show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see <http://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/README.md b/README.md
index 953c09f..f59baa9 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@
 To support multiple Minecraft versions with the ReplayMod, a preprocessor is used which transforms source code to compile against different Minecraft versions.
 
 To keep preprocessor statements to a minimum and support changes in mapping (of originally obfuscated Minecraft names), the preprocessor additionally supports
-source remapping of class, method and field names implemented in the application through use of the Eclipse JDT.
+source remapping of class, method and field names implemented in the application through use of an embedded IntelliJ IDEA (from kotlin-compiler to be precise, though Kotlin support has yet to to implemented).
 
-This is not integrated into the preprocessor itself for essentially two reasons:
+This is not integrated into the preprocessor itself for essentially two (now historical) reasons:
 - License incompatibility between the GPL used in the ReplayMod (and the preprocessor) and the EPL used by the JDT
 - Lombok requires a javaagent to work for the JDT, so we need to fork off into a separate JVM anyway
 
 ## License
-The Remap application is provided under the terms of the Eclipse Public License Version 2.
-See `EPL-2.0.txt` for the full license text.
\ No newline at end of file
+The Remap is provided under the terms of the GNU General Public License Version 3 or (at your option) any later version.
+See `LICENSE.md` for the full license text.
diff --git a/build.gradle b/build.gradle
index 9809906..35aa3df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    compile 'org.eclipse.jdt:org.eclipse.jdt.core:3.17.0'
+    compile 'org.jetbrains.kotlin:kotlin-compiler:1.3.31'
 }
 
 jar {
diff --git a/src/main/java/com/replaymod/gradle/remap/PsiMapper.java b/src/main/java/com/replaymod/gradle/remap/PsiMapper.java
new file mode 100644
index 0000000..17d0783
--- /dev/null
+++ b/src/main/java/com/replaymod/gradle/remap/PsiMapper.java
@@ -0,0 +1,396 @@
+package com.replaymod.gradle.remap;
+
+import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.JavaRecursiveElementVisitor;
+import com.intellij.psi.PsiAnnotation;
+import com.intellij.psi.PsiAnnotationMemberValue;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiClassObjectAccessExpression;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiField;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiIdentifier;
+import com.intellij.psi.PsiJavaCodeReferenceElement;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.PsiNameValuePair;
+import com.intellij.psi.PsiPackage;
+import com.intellij.psi.PsiQualifiedNamedElement;
+import com.intellij.psi.PsiSwitchLabelStatement;
+import com.intellij.psi.PsiTypeElement;
+import com.replaymod.gradle.remap.Transformer.Mapping;
+
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+class PsiMapper {
+    private static final String CLASS_MIXIN = "org.spongepowered.asm.mixin.Mixin";
+    private static final String CLASS_ACCESSOR = "org.spongepowered.asm.mixin.gen.Accessor";
+    private static final String CLASS_AT = "org.spongepowered.asm.mixin.injection.At";
+    private static final String CLASS_INJECT = "org.spongepowered.asm.mixin.injection.Inject";
+    private static final String CLASS_REDIRECT = "org.spongepowered.asm.mixin.injection.Redirect";
+
+    private final Map<String, Mapping> map;
+    private final Map<String, Mapping> mixinMappings = new HashMap<>();
+    private final PsiFile file;
+    private boolean error;
+    private TreeMap<TextRange, String> changes = new TreeMap<>(Comparator.comparing(TextRange::getStartOffset));
+
+    PsiMapper(Map<String, Mapping> map, PsiFile file) {
+        this.map = map;
+        this.file = file;
+    }
+
+    private void replace(PsiElement e, String with) {
+        changes.put(e.getTextRange(), with);
+    }
+
+    private void replaceIdentifier(PsiElement parent, String with) {
+        for (PsiElement child : parent.getChildren()) {
+            if (child instanceof PsiIdentifier) {
+                replace(child, with);
+                return;
+            }
+        }
+    }
+
+    private boolean valid(PsiElement e) {
+        TextRange range = e.getTextRange();
+        TextRange before = changes.ceilingKey(range);
+        return before == null || !before.intersects(range);
+    }
+
+    private String getResult(String text) {
+        if (error) {
+            return null;
+        }
+        for (Map.Entry<TextRange, String> change : changes.descendingMap().entrySet()) {
+            text = change.getKey().replace(text, change.getValue());
+        }
+        return text;
+    }
+
+    private static boolean isSwitchCase(PsiElement e) {
+        if (e instanceof PsiSwitchLabelStatement) {
+            return true;
+        }
+        PsiElement parent = e.getParent();
+        return parent != null && isSwitchCase(parent);
+    }
+
+    private void map(PsiElement expr, PsiField field) {
+        PsiClass declaringClass = field.getContainingClass();
+        if (declaringClass == null) return;
+        String name = declaringClass.getQualifiedName();
+        if (name == null) return;
+        Mapping mapping = this.mixinMappings.get(name);
+        if (mapping == null) {
+            mapping = map.get(name);
+        }
+        if (mapping == null) return;
+        String mapped = mapping.fields.get(field.getName());
+        if (mapped == null || mapped.equals(field.getName())) return;
+        replaceIdentifier(expr, mapped);
+
+        if (expr instanceof PsiJavaCodeReferenceElement
+                && !((PsiJavaCodeReferenceElement) expr).isQualified() // qualified access is fine
+                && !isSwitchCase(expr) // referencing constants in case statements is fine
+        ) {
+            int line = StringUtil.offsetToLineNumber(file.getText(), expr.getTextOffset());
+            System.err.println(file.getName() + ":" + line + ": Implicit member reference to remapped field \"" + field.getName() + "\". " +
+                    "This can cause issues if the remapped reference becomes shadowed by a local variable and is therefore forbidden. " +
+                    "Use \"this." + field.getName() + "\" instead.");
+            error = true;
+        }
+    }
+
+    private void map(PsiElement expr, PsiMethod method) {
+        PsiClass declaringClass = method.getContainingClass();
+        if (declaringClass == null) return;
+        ArrayDeque<PsiClass> parentQueue = new ArrayDeque<>();
+        parentQueue.offer(declaringClass);
+        Mapping mapping = null;
+
+        String name = declaringClass.getQualifiedName();
+        if (name != null) {
+            mapping = mixinMappings.get(name);
+        }
+        while (true) {
+            if (mapping != null) {
+                String mapped = mapping.methods.get(method.getName());
+                if (mapped != null) {
+                    if (!mapped.equals(method.getName())) {
+                        replaceIdentifier(expr, mapped);
+                    }
+                    return;
+                }
+                mapping = null;
+            }
+            while (mapping == null) {
+                declaringClass = parentQueue.poll();
+                if (declaringClass == null) return;
+
+                PsiClass superClass = declaringClass.getSuperClass();
+                if (superClass != null) {
+                    parentQueue.offer(superClass);
+                }
+                for (PsiClass anInterface : declaringClass.getInterfaces()) {
+                    parentQueue.offer(anInterface);
+                }
+
+                name = declaringClass.getQualifiedName();
+                if (name == null) continue;
+                mapping = map.get(name);
+            }
+        }
+    }
+
+    private void map(PsiElement expr, PsiQualifiedNamedElement resolved) {
+        String name = resolved.getQualifiedName();
+        if (name == null) return;
+        Mapping mapping = map.get(name);
+        if (mapping == null) return;
+        String mapped = mapping.newName;
+        if (mapped.equals(name)) return;
+
+        if (expr.getText().equals(name)) {
+            replace(expr, mapped);
+            return;
+        }
+        replaceIdentifier(expr, mapped.substring(mapped.lastIndexOf('.') + 1));
+    }
+
+    private void map(PsiElement expr, PsiElement resolved) {
+        if (resolved instanceof PsiField) {
+            map(expr, (PsiField) resolved);
+        } else if (resolved instanceof PsiMethod) {
+            map(expr, (PsiMethod) resolved);
+        } else if (resolved instanceof PsiClass || resolved instanceof PsiPackage) {
+            map(expr, (PsiQualifiedNamedElement) resolved);
+        }
+    }
+
+    // Note: Supports only Mixins with a single target (ignores others) and only ones specified via class literals
+    private PsiClass getMixinTarget(PsiAnnotation annotation) {
+        for (PsiNameValuePair pair : annotation.getParameterList().getAttributes()) {
+            String name = pair.getName();
+            if (name != null && !"value".equals(name)) continue;
+            PsiAnnotationMemberValue value = pair.getValue();
+            if (!(value instanceof PsiClassObjectAccessExpression)) continue;
+            PsiTypeElement type = ((PsiClassObjectAccessExpression) value).getOperand();
+            PsiJavaCodeReferenceElement reference = type.getInnermostComponentReferenceElement();
+            if (reference == null) continue;
+            return (PsiClass) reference.resolve();
+        }
+        return null;
+    }
+
+    private void remapAccessors(Mapping mapping) {
+        file.accept(new JavaRecursiveElementVisitor() {
+            @Override
+            public void visitMethod(PsiMethod method) {
+                PsiAnnotation annotation = method.getAnnotation(CLASS_ACCESSOR);
+                if (annotation == null) return;
+
+                String targetByName = method.getName();
+                if (targetByName.startsWith("is")) {
+                    targetByName = targetByName.substring(2);
+                } else if (targetByName.startsWith("get") || targetByName.startsWith("set")) {
+                    targetByName = targetByName.substring(3);
+                } else {
+                    targetByName = null;
+                }
+                if (targetByName != null) {
+                    targetByName = targetByName.substring(0, 1).toLowerCase() + targetByName.substring(1);
+                }
+
+                String target = Arrays.stream(annotation.getParameterList().getAttributes())
+                        .filter(it -> it.getName() == null || it.getName().equals("value"))
+                        .map(PsiNameValuePair::getLiteralValue)
+                        .findAny()
+                        .orElse(targetByName);
+
+                if (target == null) {
+                    throw new IllegalArgumentException("Cannot determine accessor target for " + method);
+                }
+
+                String mapped = mapping.fields.get(target);
+                if (mapped != null && !mapped.equals(target)) {
+                    // Update accessor target
+                    String parameterList;
+                    if (mapped.equals(targetByName)) {
+                        // Mapped name matches implied target, can just remove the explict target
+                        parameterList = "";
+                    } else {
+                        // Mapped name does not match implied target, need to set the target as annotation value
+                        parameterList = "(\"" + StringUtil.escapeStringCharacters(mapped) + "\")";
+                    }
+                    replace(annotation.getParameterList(), parameterList);
+                }
+            }
+        });
+    }
+
+    private void remapInjectsAndRedirects(Mapping mapping) {
+        file.accept(new JavaRecursiveElementVisitor() {
+            @Override
+            public void visitMethod(PsiMethod method) {
+                PsiAnnotation annotation = method.getAnnotation(CLASS_INJECT);
+                if (annotation == null) {
+                    annotation = method.getAnnotation(CLASS_REDIRECT);
+                }
+                if (annotation == null) return;
+
+                for (PsiNameValuePair attribute : annotation.getParameterList().getAttributes()) {
+                    if (!"method".equals(attribute.getName())) continue;
+                    // Note: mixin supports multiple targets, we do not (yet)
+                    String literalValue = attribute.getLiteralValue();
+                    if (literalValue == null) continue;
+                    String mapped = mapping.methods.get(literalValue);
+                    if (mapped != null && !mapped.equals(literalValue)) {
+                        PsiAnnotationMemberValue value = attribute.getValue();
+                        assert value != null;
+                        replace(value, '"' + mapped + '"');
+                    }
+                }
+            }
+        });
+    }
+
+    private Mapping remapInternalType(String internalType, StringBuilder result) {
+        if (internalType.charAt(0) == 'L') {
+            String type = internalType.substring(1, internalType.length() - 1).replace('/', '.');
+            Mapping mapping = map.get(type);
+            if (mapping != null) {
+                result.append('L').append(mapping.newName.replace('.', '/')).append(';');
+                return mapping;
+            }
+        }
+        result.append(internalType);
+        return null;
+    }
+
+    private String remapFullyQualifiedMethodOrField(String signature) {
+        int ownerEnd = signature.indexOf(';');
+        int argsBegin = signature.indexOf('(');
+        int argsEnd = signature.indexOf(')');
+        boolean method = argsBegin != -1;
+        if (!method) {
+            argsBegin = argsEnd = signature.indexOf(':');
+        }
+        String owner = signature.substring(0, ownerEnd + 1);
+        String name = signature.substring(ownerEnd + 1, argsBegin);
+        String returnType = signature.substring(argsEnd + 1);
+
+        StringBuilder builder = new StringBuilder(signature.length() + 32);
+        Mapping mapping = remapInternalType(owner, builder);
+        String mapped = null;
+        if (mapping != null) {
+            mapped = (method ? mapping.methods : mapping.fields).get(name);
+        }
+        builder.append(mapped != null ? mapped : name);
+        if (method) {
+            builder.append('(');
+            String args = signature.substring(argsBegin + 1, argsEnd);
+            for (int i = 0; i < args.length(); i++) {
+                char c = args.charAt(i);
+                if (c != 'L') {
+                    builder.append(c);
+                    continue;
+                }
+                int end = args.indexOf(';', i);
+                String arg = args.substring(i, end + 1);
+                remapInternalType(arg, builder);
+                i = end;
+            }
+            builder.append(')');
+        } else {
+            builder.append(':');
+        }
+        remapInternalType(returnType, builder);
+        return builder.toString();
+    }
+
+    private void remapAtTargets() {
+        file.accept(new JavaRecursiveElementVisitor() {
+            @Override
+            public void visitAnnotation(PsiAnnotation annotation) {
+                if (!CLASS_AT.equals(annotation.getQualifiedName())) {
+                    super.visitAnnotation(annotation);
+                    return;
+                }
+
+                for (PsiNameValuePair attribute : annotation.getParameterList().getAttributes()) {
+                    if (!"target".equals(attribute.getName())) continue;
+                    String signature = attribute.getLiteralValue();
+                    if (signature == null) continue;
+                    String newSignature = remapFullyQualifiedMethodOrField(signature);
+                    if (!newSignature.equals(signature)) {
+                        PsiAnnotationMemberValue value = attribute.getValue();
+                        assert value != null;
+                        replace(value, '"' + newSignature + '"');
+                    }
+                }
+            }
+        });
+    }
+
+    String remapFile() {
+        file.accept(new JavaRecursiveElementVisitor() {
+            @Override
+            public void visitClass(PsiClass psiClass) {
+                PsiAnnotation annotation = psiClass.getAnnotation(CLASS_MIXIN);
+                if (annotation == null) return;
+
+                remapAtTargets();
+
+                PsiClass target = getMixinTarget(annotation);
+                if (target == null) return;
+
+                Mapping mapping = map.get(target.getQualifiedName());
+                if (mapping == null) return;
+
+                mixinMappings.put(psiClass.getQualifiedName(), mapping);
+
+                if (!mapping.fields.isEmpty()) {
+                    remapAccessors(mapping);
+                }
+                if (!mapping.methods.isEmpty()) {
+                    remapInjectsAndRedirects(mapping);
+                }
+            }
+        });
+
+        file.accept(new JavaRecursiveElementVisitor() {
+            @Override
+            public void visitField(PsiField field) {
+                if (valid(field)) {
+                    map(field, field);
+                }
+                super.visitField(field);
+            }
+
+            @Override
+            public void visitMethod(PsiMethod method) {
+                if (valid(method)) {
+                    map(method, method);
+                }
+                super.visitMethod(method);
+            }
+
+            @Override
+            public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
+                if (valid(reference)) {
+                    map(reference, reference.resolve());
+                }
+                super.visitReferenceElement(reference);
+            }
+        });
+
+        return getResult(file.getText());
+    }
+}
diff --git a/src/main/java/com/replaymod/gradle/remap/Transformer.java b/src/main/java/com/replaymod/gradle/remap/Transformer.java
index e41867f..1cbd425 100644
--- a/src/main/java/com/replaymod/gradle/remap/Transformer.java
+++ b/src/main/java/com/replaymod/gradle/remap/Transformer.java
@@ -1,11 +1,28 @@
 package com.replaymod.gradle.remap;
 
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.dom.*;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.text.edits.TextEdit;
+import com.intellij.codeInsight.CustomExceptionHandler;
+import com.intellij.mock.MockProject;
+import com.intellij.openapi.extensions.ExtensionPoint;
+import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.vfs.StandardFileSystems;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.local.CoreLocalFileSystem;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys;
+import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot;
+import org.jetbrains.kotlin.cli.common.messages.MessageRenderer;
+import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector;
+import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
+import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
+import org.jetbrains.kotlin.cli.jvm.compiler.NoScopeRecordCliBindingTrace;
+import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM;
+import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot;
+import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot;
+import org.jetbrains.kotlin.config.CommonConfigurationKeys;
+import org.jetbrains.kotlin.config.CompilerConfiguration;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -15,14 +32,11 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
-import java.util.ArrayDeque;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -32,7 +46,7 @@ class Transformer {
     private String[] classpath;
     private boolean fail;
 
-    public static void main(String[] args) throws IOException, BadLocationException {
+    public static void main(String[] args) throws IOException {
         Map<String, Mapping> mappings;
         if (args[0].isEmpty()) {
             mappings = new HashMap<>();
@@ -93,21 +107,9 @@ class Transformer {
         this.classpath = classpath;
     }
 
-    public Map<String, String> remap(Map<String, String> sources) throws BadLocationException, IOException {
-        ASTParser parser = ASTParser.newParser(AST.JLS8);
-        Map<String, String> options = JavaCore.getDefaultOptions();
-        JavaCore.setComplianceOptions("1.8", options);
-        parser.setCompilerOptions(options);
-        parser.setEnvironment(classpath, null, null, true);
-        parser.setResolveBindings(true);
-        parser.setBindingsRecovery(true);
-
+    public Map<String, String> remap(Map<String, String> sources) throws IOException {
         Path tmpDir = Files.createTempDirectory("remap");
         try {
-            Map<String, String> filePathToName = new HashMap<>();
-            String[] compilationUnits = new String[sources.size()];
-            String[] encodings = new String[compilationUnits.length];
-            int i = 0;
             for (Entry<String, String> entry : sources.entrySet()) {
                 String unitName = entry.getKey();
                 String source = entry.getValue();
@@ -115,456 +117,52 @@ class Transformer {
                 Path path = tmpDir.resolve(unitName);
                 Files.createDirectories(path.getParent());
                 Files.write(path, source.getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE);
-                String filePath = path.toString();
-                filePathToName.put(filePath, unitName);
-                compilationUnits[i] = filePath;
-                encodings[i] = "UTF-8";
-
-                i++;
             }
-            Map<String, CompilationUnit> cus = new HashMap<>();
-            parser.createASTs(compilationUnits, encodings, new String[0], new FileASTRequestor() {
-                @Override
-                public void acceptAST(String sourceFilePath, CompilationUnit cu) {
-                    String unitName = filePathToName.get(sourceFilePath);
-                    for (IProblem problem : cu.getProblems()) {
-                        if (problem.isError()) {
-                            System.err.println(unitName + ":" + problem.getSourceLineNumber() + ": " + problem.getMessage());
-                        }
-                    }
-                    cus.put(unitName, cu);
-                }
-            }, null);
 
-            Map<String, String> results = new HashMap<>();
-            for (Entry<String, CompilationUnit> entry : cus.entrySet()) {
-                String unitName = entry.getKey();
-                CompilationUnit cu = entry.getValue();
+            CompilerConfiguration config = new CompilerConfiguration();
+            config.put(CommonConfigurationKeys.MODULE_NAME, "main");
+            config.add(CLIConfigurationKeys.CONTENT_ROOTS, new JavaSourceRoot(tmpDir.toFile(), ""));
+            config.add(CLIConfigurationKeys.CONTENT_ROOTS, new KotlinSourceRoot(tmpDir.toAbsolutePath().toString(), false));
+            config.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, new PrintingMessageCollector(System.err, MessageRenderer.GRADLE_STYLE, true));
 
-                cu.recordModifications();
-                if (remapClass(unitName, cu)) {
-                    Document document = new Document(sources.get(unitName));
-                    TextEdit edit = cu.rewrite(document, JavaCore.getDefaultOptions());
-                    edit.apply(document);
-                    results.put(unitName, document.get());
-                } else {
-                    results.put(unitName, sources.get(unitName));
-                }
-            }
-            return results;
-        } finally {
-            Files.walk(tmpDir).map(Path::toFile).sorted(Comparator.reverseOrder()).forEach(File::delete);
-        }
-    }
+            KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForProduction(
+                    Disposer.newDisposable(),
+                    config,
+                    EnvironmentConfigFiles.JVM_CONFIG_FILES
+            );
+            Extensions.getRootArea().registerExtensionPoint(CustomExceptionHandler.KEY.getName(), CustomExceptionHandler.class.getName(), ExtensionPoint.Kind.INTERFACE);
 
-    private static final String CLASS_MIXIN = "org.spongepowered.asm.mixin.Mixin";
-    private static final String CLASS_ACCESSOR = "org.spongepowered.asm.mixin.gen.Accessor";
-    private static final String CLASS_AT = "org.spongepowered.asm.mixin.injection.At";
-    private static final String CLASS_INJECT = "org.spongepowered.asm.mixin.injection.Inject";
-    private static final String CLASS_REDIRECT = "org.spongepowered.asm.mixin.injection.Redirect";
+            MockProject project = (MockProject) environment.getProject();
 
-    // Note: Supports only Mixins with a single target (ignores others) and only ones specified via class literals
-    private ITypeBinding getMixinTarget(IAnnotationBinding annotation) {
-        for (IMemberValuePairBinding pair : annotation.getDeclaredMemberValuePairs()) {
-            if (pair.getName().equals("value")) {
-                return (ITypeBinding) ((Object[]) pair.getValue())[0];
-            }
-        }
-        return null;
-    }
-
-    private boolean remapAccessors(CompilationUnit cu, Mapping mapping) {
-        AtomicBoolean changed = new AtomicBoolean(false);
-        AST ast = cu.getAST();
+            environment.updateClasspath(Stream.of(getClasspath()).map(it -> new JvmClasspathRoot(new File(it))).collect(Collectors.toList()));
 
-        cu.accept(new ASTVisitor() {
-            @Override
-            public boolean visit(MethodDeclaration node) {
-                int annotationIndex = -1;
-                Annotation annotationNode = null;
-                IAnnotationBinding annotation = null;
-                for (int i = 0; i < node.modifiers().size(); i++) {
-                    Object obj = node.modifiers().get(i);
-                    if (!(obj instanceof Annotation)) {
-                        continue;
-                    }
-                    annotationNode = (Annotation) obj;
-                    annotation = annotationNode.resolveAnnotationBinding();
-                    if (annotation != null && annotation.getAnnotationType().getQualifiedName().equals(CLASS_ACCESSOR)) {
-                        annotationIndex = i;
-                        break;
-                    }
-                }
-                if (annotationIndex == -1) return false;
+            TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
+                    project,
+                    Collections.emptyList(),
+                    new NoScopeRecordCliBindingTrace(),
+                    environment.getConfiguration(),
+                    environment::createPackagePartProvider
+            );
 
-                String targetByName = node.getName().getIdentifier();
-                if (targetByName.startsWith("is")) {
-                    targetByName = targetByName.substring(2);
-                } else if (targetByName.startsWith("get") || targetByName.startsWith("set")) {
-                    targetByName = targetByName.substring(3);
-                } else {
-                    targetByName = null;
-                }
-                if (targetByName != null) {
-                    targetByName = targetByName.substring(0, 1).toLowerCase() + targetByName.substring(1);
-                }
-
-                String target = Arrays.stream(annotation.getDeclaredMemberValuePairs())
-                        .filter(it -> it.getName().equals("value"))
-                        .map(it -> (String) it.getValue())
-                        .findAny()
-                        .orElse(targetByName);
-
-                if (target == null) {
-                    throw new IllegalArgumentException("Cannot determine accessor target for " + node);
-                }
-
-                String mapped = mapping.fields.get(target);
-                if (mapped != null && !mapped.equals(target)) {
-
-                    Annotation newAnnotation;
-
-                    // Update accessor target
-                    if (mapped.equals(targetByName)) {
-                        // Mapped name matches implied target, can just remove the explict target
-                        newAnnotation = ast.newMarkerAnnotation();
-                    } else {
-                        // Mapped name does not match implied target, need to set the target as annotation value
-                        SingleMemberAnnotation singleMemberAnnotation = ast.newSingleMemberAnnotation();
-                        StringLiteral value = ast.newStringLiteral();
-                        value.setLiteralValue(mapped);
-                        singleMemberAnnotation.setValue(value);
-                        newAnnotation = singleMemberAnnotation;
-                    }
-
-                    newAnnotation.setTypeName(ast.newName(annotationNode.getTypeName().getFullyQualifiedName()));
-                    //noinspection unchecked
-                    node.modifiers().set(annotationIndex, newAnnotation);
-
-                    changed.set(true);
-                }
-
-                return false;
-            }
-        });
-
-        return changed.get();
-    }
-
-    private boolean remapInjectsAndRedirects(CompilationUnit cu, Mapping mapping) {
-        AtomicBoolean changed = new AtomicBoolean(false);
-
-        cu.accept(new ASTVisitor() {
-            @Override
-            public boolean visit(MethodDeclaration node) {
-                NormalAnnotation annotationNode = null;
-                for (Object obj : node.modifiers()) {
-                    if (!(obj instanceof NormalAnnotation)) {
-                        continue;
-                    }
-                    annotationNode = (NormalAnnotation) obj;
-                    IAnnotationBinding annotation = annotationNode.resolveAnnotationBinding();
-                    if (annotation != null) {
-                        String qualifiedName = annotation.getAnnotationType().getQualifiedName();
-                        if (qualifiedName.equals(CLASS_INJECT) || qualifiedName.equals(CLASS_REDIRECT)) {
-                            break;
-                        }
-                    }
-                    annotationNode = null;
-                }
-                if (annotationNode == null) return false;
-
-                //noinspection unchecked
-                for (MemberValuePair pair : (List<MemberValuePair>) annotationNode.values()) {
-                    if (!pair.getName().getIdentifier().equals("method")) continue;
-
-                    Object expr = pair.getValue();
-                    // Note: mixin supports multiple targets, we do not (yet)
-                    if (!(expr instanceof StringLiteral)) continue;
-                    StringLiteral methodNode = (StringLiteral) expr;
-                    String method = methodNode.getLiteralValue();
-                    String mapped = mapping.methods.get(method);
-                    if (mapped != null && !mapped.equals(method)) {
-                        methodNode.setLiteralValue(mapped);
-                        changed.set(true);
-                    }
-                }
-
-                return false;
-            }
-        });
-
-        return changed.get();
-    }
-
-    private Mapping remapInternalType(String internalType, StringBuilder result) {
-        if (internalType.charAt(0) == 'L') {
-            String type = internalType.substring(1, internalType.length() - 1).replace('/', '.');
-            Mapping mapping = map.get(type);
-            if (mapping != null) {
-                result.append('L').append(mapping.newName.replace('.', '/')).append(';');
-                return mapping;
-            }
-        }
-        result.append(internalType);
-        return null;
-    }
-
-    private String remapFullyQualifiedMethodOrField(String signature) {
-        int ownerEnd = signature.indexOf(';');
-        int argsBegin = signature.indexOf('(');
-        int argsEnd = signature.indexOf(')');
-        boolean method = argsBegin != -1;
-        if (!method) {
-            argsBegin = argsEnd = signature.indexOf(':');
-        }
-        String owner = signature.substring(0, ownerEnd + 1);
-        String name = signature.substring(ownerEnd + 1, argsBegin);
-        String returnType = signature.substring(argsEnd + 1);
-
-        StringBuilder builder = new StringBuilder(signature.length() + 32);
-        Mapping mapping = remapInternalType(owner, builder);
-        String mapped = null;
-        if (mapping != null) {
-            mapped = (method ? mapping.methods : mapping.fields).get(name);
-        }
-        builder.append(mapped != null ? mapped : name);
-        if (method) {
-            builder.append('(');
-            String args = signature.substring(argsBegin + 1, argsEnd);
-            for (int i = 0; i < args.length(); i++) {
-                char c = args.charAt(i);
-                if (c != 'L') {
-                    builder.append(c);
+            CoreLocalFileSystem vfs = (CoreLocalFileSystem) VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL);
+            Map<String, String> results = new HashMap<>();
+            for (String name : sources.keySet()) {
+                VirtualFile file = vfs.findFileByIoFile(tmpDir.resolve(name).toFile());
+                assert file != null;
+                PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
+                assert psiFile != null;
+
+                String mapped = new PsiMapper(map, psiFile).remapFile();
+                if (mapped == null) {
+                    fail = true;
                     continue;
                 }
-                int end = args.indexOf(';', i);
-                String arg = args.substring(i, end + 1);
-                remapInternalType(arg, builder);
-                i = end;
+                results.put(name, mapped);
             }
-            builder.append(')');
-        } else {
-            builder.append(':');
+            return results;
+        } finally {
+            Files.walk(tmpDir).map(Path::toFile).sorted(Comparator.reverseOrder()).forEach(File::delete);
         }
-        remapInternalType(returnType, builder);
-        return builder.toString();
-    }
-
-    private boolean remapAtTargets(CompilationUnit cu) {
-        AtomicBoolean changed = new AtomicBoolean(false);
-
-        cu.accept(new ASTVisitor() {
-            @Override
-            public boolean visit(NormalAnnotation node) {
-                IAnnotationBinding annotation = node.resolveAnnotationBinding();
-                if (annotation == null) return true;
-                String qualifiedName = annotation.getAnnotationType().getQualifiedName();
-                if (!qualifiedName.equals(CLASS_AT)) return true;
-
-                //noinspection unchecked
-                for (MemberValuePair pair : (List<MemberValuePair>) node.values()) {
-                    if (!pair.getName().getIdentifier().equals("target")) continue;
-
-                    StringLiteral value = (StringLiteral) pair.getValue();
-                    String signature = value.getLiteralValue();
-                    String newSignature = remapFullyQualifiedMethodOrField(signature);
-                    if (!newSignature.equals(signature)) {
-                        value.setLiteralValue(newSignature);
-                        changed.set(true);
-                    }
-                }
-
-                return false;
-            }
-        });
-
-        return changed.get();
-    }
-
-    private static String stripGenerics(String name) {
-        int paramIndex = name.indexOf('<');
-        return paramIndex != -1 ? name.substring(0, paramIndex) : name;
-    }
-
-    private boolean remapClass(String unitName, CompilationUnit cu) {
-        AtomicBoolean changed = new AtomicBoolean(false);
-        Map<String, Mapping> mixinMappings = new HashMap<>();
-
-        cu.accept(new ASTVisitor() {
-            @Override
-            public boolean visit(TypeDeclaration node) {
-                ITypeBinding type = node.resolveBinding();
-                if (type == null) return false;
-
-                IAnnotationBinding binding = null;
-                for (Object modifier : node.modifiers()) {
-                    if (modifier instanceof Annotation) {
-                        binding = ((Annotation) modifier).resolveAnnotationBinding();
-                        if (binding != null && !binding.getAnnotationType().getQualifiedName().equals(CLASS_MIXIN)) {
-                            binding = null;
-                        }
-                    }
-                }
-                if (binding == null) return false;
-
-                if (remapAtTargets(cu)) {
-                    changed.set(true);
-                }
-
-                ITypeBinding target = getMixinTarget(binding);
-                if (target == null) return false;
-
-                Mapping mapping = map.get(target.getQualifiedName());
-                if (mapping == null) return false;
-
-                mixinMappings.put(type.getQualifiedName(), mapping);
-
-                if (!mapping.fields.isEmpty()) {
-                    if (remapAccessors(cu, mapping)) {
-                        changed.set(true);
-                    }
-                }
-                if (!mapping.methods.isEmpty()) {
-                    if (remapInjectsAndRedirects(cu, mapping)) {
-                        changed.set(true);
-                    }
-                }
-
-                return false;
-            }
-        });
-
-        cu.accept(new ASTVisitor() {
-            @Override
-            public boolean visit(ImportDeclaration node) {
-                String name = node.getName().getFullyQualifiedName();
-                Mapping mapping = map.get(name);
-                String mapped = mapping == null ? null : mapping.newName;
-                if (mapped != null && !mapped.equals(name)) {
-                    node.setName(node.getAST().newName(mapped));
-                    changed.set(true);
-                }
-                return false;
-            }
-        });
-
-        cu.accept(new ASTVisitor() {
-            @Override
-            public boolean visit(ImportDeclaration node) {
-                return false;
-            }
-
-            @Override
-            public boolean visit(QualifiedName node) {
-                String name = node.getFullyQualifiedName();
-                Mapping mapping = map.get(name);
-                String mapped = mapping == null ? null : mapping.newName;
-                if (mapped != null && !mapped.equals(name)) {
-                    node.setQualifier(node.getAST().newName(mapped.substring(0, mapped.lastIndexOf('.'))));
-                    node.setName(node.getAST().newSimpleName(mapped.substring(mapped.lastIndexOf('.') + 1)));
-                    changed.set(true);
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-
-            @Override
-            public boolean visit(SimpleName node) {
-                return visitName(node.resolveBinding(), node);
-            }
-
-            private boolean visitName(IBinding binding, SimpleName node) {
-                String mapped;
-                if (binding instanceof IVariableBinding) {
-                    ITypeBinding declaringClass = ((IVariableBinding) binding).getDeclaringClass();
-                    if (declaringClass == null) return true;
-                    String name = stripGenerics(declaringClass.getQualifiedName());
-                    if (name.isEmpty()) return true;
-                    Mapping mapping = mixinMappings.get(name);
-                    if (mapping == null) {
-                        mapping = map.get(name);
-                    }
-                    if (mapping == null) return true;
-                    mapped = mapping.fields.get(node.getIdentifier());
-                    if (mapped != null) {
-                        ASTNode parent = node.getParent();
-                        if (!(parent instanceof FieldAccess // qualified access is fine
-                                || parent instanceof QualifiedName // qualified access is fine
-                                || parent instanceof VariableDeclarationFragment // shadow member declarations are fine
-                                || parent instanceof SwitchCase) // referencing constants in case statements is fine
-                        ) {
-                            System.err.println(unitName + ": Implicit member reference to remapped field \"" + node.getIdentifier() + "\". " +
-                                    "This can cause issues if the remapped reference becomes shadowed by a local variable and is therefore forbidden. " +
-                                    "Use \"this." + node.getIdentifier() + "\" instead.");
-                            fail = true;
-                        }
-                    }
-                } else if (binding instanceof IMethodBinding) {
-                    ITypeBinding declaringClass = ((IMethodBinding) binding).getDeclaringClass();
-                    if (declaringClass == null) return true;
-                    ArrayDeque<ITypeBinding> parentQueue = new ArrayDeque<>();
-                    parentQueue.offer(declaringClass);
-                    Mapping mapping = null;
-
-                    String name = stripGenerics(declaringClass.getQualifiedName());
-                    if (!name.isEmpty()) {
-                        mapping = mixinMappings.get(name);
-                    }
-                    while (true) {
-                        if (mapping != null) {
-                            mapped = mapping.methods.get(node.getIdentifier());
-                            if (mapped != null) {
-                                break;
-                            }
-                            mapping = null;
-                        }
-                        while (mapping == null) {
-                            declaringClass = parentQueue.poll();
-                            if (declaringClass == null) return true;
-
-                            ITypeBinding superClass = declaringClass.getSuperclass();
-                            if (superClass != null) {
-                                parentQueue.offer(superClass);
-                            }
-                            for (ITypeBinding anInterface : declaringClass.getInterfaces()) {
-                                parentQueue.offer(anInterface);
-                            }
-
-                            name = stripGenerics(declaringClass.getQualifiedName());
-                            if (name.isEmpty()) continue;
-                            mapping = map.get(name);
-                        }
-                    }
-                } else if (binding instanceof ITypeBinding) {
-                    String name = stripGenerics(((ITypeBinding) binding).getQualifiedName());
-                    if (name.isEmpty()) return true;
-                    Mapping mapping = map.get(name);
-                    if (mapping == null) return true;
-                    mapped = mapping.newName;
-                    mapped = mapped.substring(mapped.lastIndexOf('.') + 1);
-                } else {
-                    return true;
-                }
-
-                if (mapped != null && !mapped.equals(node.getIdentifier())) {
-                    node.setIdentifier(mapped);
-                    changed.set(true);
-                }
-                return true;
-            }
-
-            @Override
-            public boolean visit(MethodDeclaration node) {
-                if (node.getBody() != null && node.getLength() == node.getBody().getLength()) {
-                    // Body exists but is same length as overall definition? -> method was probably generated by lombok
-                    return false;
-                }
-                return super.visit(node);
-            }
-        });
-        return changed.get();
     }
 
     public static class Mapping {