diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000..af693cb
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,23 @@
+name: Publish
+
+on:
+  push:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
+    with:
+      java: 17
+      gradle_tasks: "publish"
+      artifact_name: "ForgeAutoRenamingTool"
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
+      PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
+      PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
diff --git a/.teamcity/patches/buildTypes/ForgeAutoRenamingTool__Build.kts b/.teamcity/patches/buildTypes/ForgeAutoRenamingTool__Build.kts
new file mode 100644
index 0000000..9f6e9a8
--- /dev/null
+++ b/.teamcity/patches/buildTypes/ForgeAutoRenamingTool__Build.kts
@@ -0,0 +1,16 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'ForgeAutoRenamingTool__Build'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("ForgeAutoRenamingTool__Build")) {
+    check(paused == false) {
+        "Unexpected paused: '$paused'"
+    }
+    paused = true
+}
diff --git a/.teamcity/patches/buildTypes/ForgeAutoRenamingTool__BuildSecondaryBranches.kts b/.teamcity/patches/buildTypes/ForgeAutoRenamingTool__BuildSecondaryBranches.kts
new file mode 100644
index 0000000..9a05ea0
--- /dev/null
+++ b/.teamcity/patches/buildTypes/ForgeAutoRenamingTool__BuildSecondaryBranches.kts
@@ -0,0 +1,16 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'ForgeAutoRenamingTool__BuildSecondaryBranches'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("ForgeAutoRenamingTool__BuildSecondaryBranches")) {
+    check(paused == false) {
+        "Unexpected paused: '$paused'"
+    }
+    paused = true
+}
diff --git a/.teamcity/patches/buildTypes/ForgeAutoRenamingTool__PullRequests.kts b/.teamcity/patches/buildTypes/ForgeAutoRenamingTool__PullRequests.kts
new file mode 100644
index 0000000..ce6c8d1
--- /dev/null
+++ b/.teamcity/patches/buildTypes/ForgeAutoRenamingTool__PullRequests.kts
@@ -0,0 +1,16 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'ForgeAutoRenamingTool__PullRequests'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("ForgeAutoRenamingTool__PullRequests")) {
+    check(paused == false) {
+        "Unexpected paused: '$paused'"
+    }
+    paused = true
+}
diff --git a/.teamcity/patches/projects/_Self.kts b/.teamcity/patches/projects/_Self.kts
deleted file mode 100644
index e2d53f1..0000000
--- a/.teamcity/patches/projects/_Self.kts
+++ /dev/null
@@ -1,26 +0,0 @@
-package patches.projects
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.Project
-import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.GitHubIssueTracker
-import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
-import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
-
-/*
-This patch script was generated by TeamCity on settings change in UI.
-To apply the patch, change the root project
-accordingly, and delete the patch script.
-*/
-changeProject(DslContext.projectId) {
-    features {
-        val feature1 = find<GitHubIssueTracker> {
-            githubIssues {
-                id = "ForgeAutoRenamingTool__IssueTracker"
-                displayName = "MinecraftForge/ForgeAutoRenamingTool"
-                repositoryURL = "https://github.com/MinecraftForge/ForgeAutoRenamingTool"
-            }
-        }
-        feature1.apply {
-        }
-    }
-}
diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml
deleted file mode 100644
index 052e240..0000000
--- a/.teamcity/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <name>MinecraftForge_ForgeAutoRenamingTool Config DSL Script</name>
-  <groupId>MinecraftForge_ForgeAutoRenamingTool</groupId>
-  <artifactId>MinecraftForge_ForgeAutoRenamingTool_dsl</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <parent>
-    <groupId>org.jetbrains.teamcity</groupId>
-    <artifactId>configs-dsl-kotlin-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <repositories>
-    <repository>
-      <id>jetbrains-all</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>teamcity-server</id>
-      <url>https://teamcity.minecraftforge.net/app/dsl-plugins-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>JetBrains</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <build>
-    <sourceDirectory>${basedir}</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
-
-        <configuration/>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <phase>process-test-sources</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jetbrains.teamcity</groupId>
-        <artifactId>teamcity-configs-maven-plugin</artifactId>
-        <version>${teamcity.dsl.version}</version>
-        <configuration>
-          <format>kotlin</format>
-          <dstDir>target/generated-configs</dstDir>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin</artifactId>
-      <version>${teamcity.dsl.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin-plugins</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>pom</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-script-runtime</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
deleted file mode 100644
index 71f06df..0000000
--- a/.teamcity/settings.kts
+++ /dev/null
@@ -1,71 +0,0 @@
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
-
-/*
-The settings script is an entry point for defining a TeamCity
-project hierarchy. The script should contain a single call to the
-project() function with a Project instance or an init function as
-an argument.
-
-VcsRoots, BuildTypes, Templates, and subprojects can be
-registered inside the project using the vcsRoot(), buildType(),
-template(), and subProject() methods respectively.
-
-To debug settings scripts in command-line, run the
-
-    mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate
-
-command and attach your debugger to the port 8000.
-
-To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
--> Tool Windows -> Maven Projects), find the generate task node
-(Plugins -> teamcity-configs -> teamcity-configs:generate), the
-'Debug' option is available in the context menu for the task.
-*/
-
-version = "2021.2"
-
-project {
-
-    buildType(Build)
-    buildType(BuildSecondaryBranches)
-    buildType(PullRequests)
-
-    params {
-        text("git_main_branch", "master", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("github_repository_name", "ForgeAutoRenamingTool", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `ForgeAutoRenamingTool` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("env.PUBLISHED_JAVA_ARTIFACT_ID", "ForgeAutoRenamingTool", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("docker_jdk_version", "8", label = "JDK version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "7.4.1", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-    }
-
-    features {
-        githubIssues {
-            id = "ForgeAutoRenamingTool__IssueTracker"
-            displayName = "MinecraftForge/ForgeAutoRenamingTool"
-            repositoryURL = "https://github.com/MinecraftForge/ForgeAutoRenamingTool"
-        }
-    }
-}
-
-object Build : BuildType({
-    templates(AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_BuildUsingGradle"), AbsoluteId("MinecraftForge_PublishProjectUsingGradle"), AbsoluteId("MinecraftForge_TriggersStaticFilesWebpageGenerator"))
-    id("ForgeAutoRenamingTool__Build")
-    name = "Build"
-    description = "Builds and Publishes the main branches of the project."
-})
-
-object BuildSecondaryBranches : BuildType({
-    templates(AbsoluteId("MinecraftForge_ExcludesBuildingDefaultBranch"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
-    id("ForgeAutoRenamingTool__BuildSecondaryBranches")
-    name = "Build - Secondary Branches"
-    description = "Builds and Publishes the secondary branches of the project."
-})
-
-object PullRequests : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
-    id("ForgeAutoRenamingTool__PullRequests")
-    name = "Pull Requests"
-    description = "Builds pull requests for the project"
-})
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index f6db84b..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,85 +0,0 @@
-@Library('forge-shared-library')_
-
-pipeline {
-    agent {
-        docker {
-            image 'gradle:jdk8'
-            args '-v gradlecache:/gradlecache'
-        }
-    }
-    environment {
-        GRADLE_ARGS = '-Dorg.gradle.daemon.idletimeout=5000'
-        DISCORD_WEBHOOK = credentials('forge-discord-jenkins-webhook')
-        DISCORD_PREFIX = "Job: Forge Auto Renaming Tool Branch: ${BRANCH_NAME} Build: #${BUILD_NUMBER}"
-        JENKINS_HEAD = 'https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png'
-    }
-
-    stages {
-        stage('notify_start') {
-            when {
-                not {
-                    changeRequest()
-                }
-            }
-            steps {
-                discordSend(
-                    title: "${DISCORD_PREFIX} Started",
-                    successful: true,
-                    result: 'ABORTED', //White border
-                    thumbnail: JENKINS_HEAD,
-                    webhookURL: DISCORD_WEBHOOK
-                )
-            }
-        }
-        stage('buildandtest') {
-            steps {
-                withGradle {
-                    sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue build test'
-                }
-                script {
-                    gradleVersion(this)
-                }
-            }
-            post {
-                success {
-                    writeChangelog(currentBuild, 'build/changelog.txt')
-                }
-            }
-        }
-        stage('publish') {
-            when {
-                not {
-                    changeRequest()
-                }
-            }
-            steps {
-                withCredentials([usernamePassword(credentialsId: 'maven-forge-user', usernameVariable: 'MAVEN_USER', passwordVariable: 'MAVEN_PASSWORD')]) {
-                    withGradle {
-                        sh './gradlew ${GRADLE_ARGS} publish'
-                    }
-                }
-            }
-            post {
-                success {
-                    build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote ${env.MYGROUP}:${env.MYARTIFACT} ${env.MYVERSION} latest")], propagate: false, wait: false
-                }
-            }
-        }
-    }
-    post {
-        always {
-            script {
-                if (env.CHANGE_ID == null) { // This is unset for non-PRs
-                    discordSend(
-                        title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}",
-                        description: '```\n' + getChanges(currentBuild) + '\n```',
-                        successful: currentBuild.resultIsBetterOrEqualTo("SUCCESS"),
-                        result: currentBuild.currentResult,
-                        thumbnail: JENKINS_HEAD,
-                        webhookURL: DISCORD_WEBHOOK
-                    )
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/LICENSE b/LICENSE.txt
similarity index 100%
rename from LICENSE
rename to LICENSE.txt
diff --git a/build.gradle b/build.gradle
index 0e13320..6bce142 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,141 +1,127 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        maven { url = 'https://maven.minecraftforge.net/' }
-    }
-    dependencies {
-        classpath  group: 'net.minecraftforge.gradleutils', name: 'GradleUtils', version: '2.+', changing: true
-    }
-}
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id 'java-library'
     id 'eclipse'
     id 'maven-publish'
-    id 'org.cadixdev.licenser' version '0.6.1'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'net.minecraftforge.licenser' version '1.0.1'
+    id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
 }
-apply plugin: 'net.minecraftforge.gradleutils'
 
-group 'net.minecraftforge'
+group = 'net.minecraftforge'
 version = gradleutils.getTagOffsetBranchVersion(null, 'master', 'HEAD')
-println('Version: ' + version)
-
-java.toolchain.languageVersion = JavaLanguageVersion.of(8)
-compileJava.options.encoding = 'UTF-8'
+println "Version: $version"
 
-ext {
-    CHANGELOG = rootProject.file('build/changelog.txt')
-    REPO = 'ForgeAutoRenamingTool'
-    TITLE = 'Forge Auto Renaming Tool'
-    MANIFEST = manifest{
-        attributes('Main-Class': 'net.minecraftforge.fart.Main')
-        attributes([
-            'Specification-Title':      'ForgeAutoRenamingTool',
-            'Specification-Vendor':     'Forge Development LLC',
-            'Specification-Version':    gradleutils.gitInfo.tag,
-            'Implementation-Title':     'SimpleInstaller',
-            'Implementation-Version':   project.version,
-            'Implementation-Vendor':    'Forge Development LLC'
-        ] as LinkedHashMap, 'net/minecraftforge/fart/')
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
     }
-    INITIAL_CHANGELOG_TAG = '0.1'
+    withSourcesJar()
 }
 
 repositories {
     mavenCentral()
-    maven { url = 'https://maven.minecraftforge.net/' }
-}
-
-test {
-    useJUnitPlatform()
-}
-
-license {
-    header = file('LICENSE-header.txt')
-    ext.project = TITLE
+    maven gradleutils.forgeMaven
 }
 
 dependencies {
-    implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
-    api 'net.minecraftforge:srgutils:0.5.1'
-    implementation 'org.ow2.asm:asm:9.5'
-    implementation 'org.ow2.asm:asm-commons:9.5'
-    implementation 'org.ow2.asm:asm-tree:9.5'
+    implementation(libs.jopt.simple)
+    api(libs.srgutils)
+    implementation(libs.bundles.asm)
 
-    testImplementation(platform('org.junit:junit-bom:5.8.1'))
-    testImplementation('org.junit.jupiter:junit-jupiter')
-    testImplementation('org.powermock:powermock-core:2.0.9')
+    testImplementation(libs.junit.api)
+    testRuntimeOnly(libs.bundles.junit.runtime)
+    testImplementation(libs.powermock)
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly(libs.nulls)
 }
 
+tasks.named('test', Test).configure {
+    useJUnitPlatform()
+    testLogging {
+        events 'passed', 'skipped', 'failed'
+    }
+}
 
-test {
-  useJUnitPlatform()
-  testLogging {
-    events 'passed', 'skipped', 'failed'
-  }
+tasks.named('jar', Jar).configure {
+    manifest {
+        attributes('Main-Class': 'net.minecraftforge.fart.Main')
+        attributes([
+                'Specification-Title':      'ForgeAutoRenamingTool',
+                'Specification-Vendor':     'Forge Development LLC',
+                'Specification-Version':    gradleutils.gitInfo.tag,
+                'Implementation-Title':     'ForgeAutoRenamingTool',
+                'Implementation-Version':   project.version,
+                'Implementation-Vendor':    'Forge Development LLC'
+        ], 'net/minecraftforge/fart/')
+    }
 }
 
-java.withSourcesJar()
+tasks.named('shadowJar', ShadowJar).configure {
+    manifest {
+        attributes('Main-Class': 'net.minecraftforge.fart.Main')
+        attributes([
+                'Specification-Title':      'ForgeAutoRenamingTool',
+                'Specification-Vendor':     'Forge Development LLC',
+                'Specification-Version':    gradleutils.gitInfo.tag,
+                'Implementation-Title':     'ForgeAutoRenamingTool',
+                'Implementation-Version':   project.version,
+                'Implementation-Vendor':    'Forge Development LLC'
+        ], 'net/minecraftforge/fart/')
+    }
 
-shadowJar {
-    manifest.from(MANIFEST)
     minimize()
 
-    def relocations = [
+    final List<String> relocations = [
             'org.objectweb.asm',
             'net.minecraftforge.srgutils',
             'joptsimple'
     ]
 
-    relocations.forEach {
+    relocations.each {
         relocate it, "net.minecraftforge.fart.relocated.$it"
     }
 }
 
-assemble.dependsOn shadowJar
+tasks.named('assemble').configure {
+    dependsOn 'shadowJar'
+}
+
+tasks.named('compileJava', JavaCompile).configure {
+    options.encoding = 'UTF-8'
+}
+
+changelog {
+    from '0.1'
+}
+
+license {
+    header = file('LICENSE-header.txt')
+    newLine = false
+    exclude '**/*.properties'
+}
 
 publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-            pom {
-                name = TITLE
-                description = 'A tool that renames java bytecode elements.'
-                url = "https://github.com/MinecraftForge/${REPO}"
-                scm {
-                    url = "https://github.com/MinecraftForge/${REPO}"
-                    connection = "scm:git:git://github.com/MinecraftForge/${REPO}.git"
-                    developerConnection = "scm:git:git@github.com:MinecraftForge/${REPO}.git"
-                }
-                issueManagement {
-                    system = 'github'
-                    url = "https://github.com/MinecraftForge/${REPO}/issues"
-                }
-
-                licenses {
-                    license {
-                        name = 'LGPLv2.1'
-                        url = 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id = 'LexManos'
-                        name = 'LexManos'
-                    }
-                }
+    publications.register('mavenJava', MavenPublication) {
+        from components.java
+
+        pom {
+            name = 'Forge Auto Renaming Tool'
+            description = 'A tool that renames java bytecode elements.'
+            url = 'https://github.com/MinecraftForge/ForgeAutoRenamingTool'
+
+            gradleutils.pom.setGitHubDetails(pom, 'ForgeAutoRenamingTool')
+
+            license gradleutils.pom.Licenses.LGPLv2_1
+
+            developers {
+                developer gradleutils.pom.Developers.LexManos
             }
         }
     }
+
     repositories {
-        maven gradleutils.getPublishingForgeMaven()
+        maven gradleutils.publishingForgeMaven
     }
 }
-
-changelog {
-    fromTag INITIAL_CHANGELOG_TAG
-}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..e69de29 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 00e33ed..3fa8f86 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index c53aefa..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..93e3f59 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle b/settings.gradle
index e0326a0..1950078 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,38 @@
-rootProject.name = 'ForgeAutoRenamingTool'
\ No newline at end of file
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = 'MinecraftForge'
+            url = 'https://maven.minecraftforge.net/'
+        }
+    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+}
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        libs {
+            library('jopt-simple', 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3')
+            library('srgutils', 'net.minecraftforge:srgutils:0.5.10')
+            library('nulls', 'org.jetbrains:annotations:24.0.1')
+            library('powermock', 'org.powermock:powermock-core:2.0.9')
+
+            version('asm', '9.7.1')
+            library('asm',         'org.ow2.asm', 'asm'        ).versionRef('asm')
+            library('asm-commons', 'org.ow2.asm', 'asm-commons').versionRef('asm')
+            library('asm-tree',    'org.ow2.asm', 'asm-tree'   ).versionRef('asm')
+            bundle('asm', ['asm', 'asm-commons', 'asm-tree'])
+
+            version('junit', '5.10.1')
+            library('junit-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
+            library('junit-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
+            library('junit-platform-launcher', 'org.junit.platform:junit-platform-launcher:1.10.1')
+            bundle('junit-runtime', ['junit-engine', 'junit-platform-launcher'])
+        }
+    }
+}
+
+rootProject.name = 'ForgeAutoRenamingTool'
diff --git a/src/main/java/net/minecraftforge/fart/Main.java b/src/main/java/net/minecraftforge/fart/Main.java
index 7963609..f1c7afe 100644
--- a/src/main/java/net/minecraftforge/fart/Main.java
+++ b/src/main/java/net/minecraftforge/fart/Main.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart;
 
 import java.io.File;
@@ -62,6 +61,7 @@ public static void main(String[] args) throws IOException {
         };
         if (options.has(logO)) {
             PrintStream out = System.out;
+            @SuppressWarnings("resource")
             PrintStream file = new PrintStream(new FileOutputStream(options.valueOf(logO)));
             log = ln -> {
                 if (!ln.isEmpty()) {
diff --git a/src/main/java/net/minecraftforge/fart/api/ClassProvider.java b/src/main/java/net/minecraftforge/fart/api/ClassProvider.java
index 9f66d17..ae19441 100644
--- a/src/main/java/net/minecraftforge/fart/api/ClassProvider.java
+++ b/src/main/java/net/minecraftforge/fart/api/ClassProvider.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.api;
 
 import net.minecraftforge.fart.internal.ClassLoaderClassProvider;
diff --git a/src/main/java/net/minecraftforge/fart/api/IdentifierFixerConfig.java b/src/main/java/net/minecraftforge/fart/api/IdentifierFixerConfig.java
index 56eb28e..d9fa520 100644
--- a/src/main/java/net/minecraftforge/fart/api/IdentifierFixerConfig.java
+++ b/src/main/java/net/minecraftforge/fart/api/IdentifierFixerConfig.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.api;
 
 /**
diff --git a/src/main/java/net/minecraftforge/fart/api/Renamer.java b/src/main/java/net/minecraftforge/fart/api/Renamer.java
index 27474df..0d23fff 100644
--- a/src/main/java/net/minecraftforge/fart/api/Renamer.java
+++ b/src/main/java/net/minecraftforge/fart/api/Renamer.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.api;
 
 import java.io.Closeable;
diff --git a/src/main/java/net/minecraftforge/fart/api/SignatureStripperConfig.java b/src/main/java/net/minecraftforge/fart/api/SignatureStripperConfig.java
index b96b923..818a2c0 100644
--- a/src/main/java/net/minecraftforge/fart/api/SignatureStripperConfig.java
+++ b/src/main/java/net/minecraftforge/fart/api/SignatureStripperConfig.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.api;
 
 /**
diff --git a/src/main/java/net/minecraftforge/fart/api/SourceFixerConfig.java b/src/main/java/net/minecraftforge/fart/api/SourceFixerConfig.java
index 0cbbecb..5fd07d6 100644
--- a/src/main/java/net/minecraftforge/fart/api/SourceFixerConfig.java
+++ b/src/main/java/net/minecraftforge/fart/api/SourceFixerConfig.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.api;
 
 /**
diff --git a/src/main/java/net/minecraftforge/fart/api/Transformer.java b/src/main/java/net/minecraftforge/fart/api/Transformer.java
index 05b185f..470f609 100644
--- a/src/main/java/net/minecraftforge/fart/api/Transformer.java
+++ b/src/main/java/net/minecraftforge/fart/api/Transformer.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.api;
 
 import java.io.File;
diff --git a/src/main/java/net/minecraftforge/fart/internal/AsyncHelper.java b/src/main/java/net/minecraftforge/fart/internal/AsyncHelper.java
index ac2cf26..ae4ee04 100644
--- a/src/main/java/net/minecraftforge/fart/internal/AsyncHelper.java
+++ b/src/main/java/net/minecraftforge/fart/internal/AsyncHelper.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import java.util.ArrayList;
diff --git a/src/main/java/net/minecraftforge/fart/internal/ClassLoaderClassProvider.java b/src/main/java/net/minecraftforge/fart/internal/ClassLoaderClassProvider.java
index 7618aed..c342fc4 100644
--- a/src/main/java/net/minecraftforge/fart/internal/ClassLoaderClassProvider.java
+++ b/src/main/java/net/minecraftforge/fart/internal/ClassLoaderClassProvider.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import net.minecraftforge.fart.api.ClassProvider;
diff --git a/src/main/java/net/minecraftforge/fart/internal/ClassProviderBuilderImpl.java b/src/main/java/net/minecraftforge/fart/internal/ClassProviderBuilderImpl.java
index 3391600..481fa98 100644
--- a/src/main/java/net/minecraftforge/fart/internal/ClassProviderBuilderImpl.java
+++ b/src/main/java/net/minecraftforge/fart/internal/ClassProviderBuilderImpl.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import java.io.IOException;
diff --git a/src/main/java/net/minecraftforge/fart/internal/ClassProviderImpl.java b/src/main/java/net/minecraftforge/fart/internal/ClassProviderImpl.java
index cb99b4f..d39b9f0 100644
--- a/src/main/java/net/minecraftforge/fart/internal/ClassProviderImpl.java
+++ b/src/main/java/net/minecraftforge/fart/internal/ClassProviderImpl.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import net.minecraftforge.fart.api.ClassProvider;
@@ -145,7 +144,7 @@ public ClassInfo(byte[] data) {
 
             Field[] flds = node.getDeclaredFields();
             if (flds != null && flds.length > 0) {
-                this.fields = Collections.unmodifiableMap(Arrays.asList(flds).stream().map(FieldInfo::new)
+                this.fields = Collections.unmodifiableMap(Arrays.stream(flds).map(FieldInfo::new)
                     .collect(Collectors.toMap(FieldInfo::getName, Function.identity())));
             } else
                 this.fields = null;
@@ -349,7 +348,7 @@ public String toString() {
                 if (ret.isEmpty())
                     toString = "default";
                 else
-                    toString = ret.stream().collect(Collectors.joining(" "));
+                    toString = String.join(" ", ret);
             }
             return toString;
         }
diff --git a/src/main/java/net/minecraftforge/fart/internal/EnhancedClassRemapper.java b/src/main/java/net/minecraftforge/fart/internal/EnhancedClassRemapper.java
index c8bf8bd..e18c972 100644
--- a/src/main/java/net/minecraftforge/fart/internal/EnhancedClassRemapper.java
+++ b/src/main/java/net/minecraftforge/fart/internal/EnhancedClassRemapper.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import java.util.ArrayList;
diff --git a/src/main/java/net/minecraftforge/fart/internal/EnhancedRemapper.java b/src/main/java/net/minecraftforge/fart/internal/EnhancedRemapper.java
index a5ed715..2f751d9 100644
--- a/src/main/java/net/minecraftforge/fart/internal/EnhancedRemapper.java
+++ b/src/main/java/net/minecraftforge/fart/internal/EnhancedRemapper.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import java.util.ArrayList;
@@ -42,7 +41,32 @@ public EnhancedRemapper(ClassProvider classProvider, IMappingFile map, Consumer<
     }
 
     @Override public String mapModuleName(final String name) { return name; } // TODO? None of the mapping formats support this.
-    @Override public String mapAnnotationAttributeName(final String descriptor, final String name) { return name; } // TODO: Is this just methods?
+    @Override
+    public String mapAnnotationAttributeName(final String descriptor, final String name) {
+        Type type = Type.getType(descriptor);
+        if (type.getSort() != Type.OBJECT)
+            return name;
+
+        MClass cls = getClass(type.getInternalName()).orElse(null);
+        if (cls == null)
+            return name;
+
+        List<MClass.MMethod> lst = cls.getMethods(name).orElse(null);
+        if (lst == null)
+            return name;
+
+        // You should not be able to specify conflicting annotation value names
+        // As annotation attributes can't have parameters, and the bytecode doesn't store the descriptor
+        // But renamers can be weird so log instead of doing weird things.
+        if (lst.size() != 1) {
+            for (MClass.MMethod mtd : lst)
+                log.accept("Duplicate Annotation name: " + cls.getName() + " " + mtd.getName() + mtd.getDescriptor() + " -> " + cls.getMapped() + " " + mtd.getName());
+            return name;
+        }
+
+        return lst.get(0).getMapped();
+    }
+
     @Override public String mapInvokeDynamicMethodName(final String name, final String descriptor) { return name; } // TODO: Lookup how the JVM resolves this and attempt to resolve it to get the owner?
 
     @Override
@@ -141,9 +165,10 @@ public class MClass {
         private final String mappedName;
         private final List<MClass> parents;
         private final Map<String, Optional<MField>> fields = new ConcurrentHashMap<>();
-        private Collection<Optional<MField>> fieldsView = Collections.unmodifiableCollection(fields.values());
+        private final Collection<Optional<MField>> fieldsView = Collections.unmodifiableCollection(fields.values());
         private final Map<String, Optional<MMethod>> methods = new ConcurrentHashMap<>();
-        private Collection<Optional<MMethod>> methodsView = Collections.unmodifiableCollection(methods.values());
+        private final Collection<Optional<MMethod>> methodsView = Collections.unmodifiableCollection(methods.values());
+        private final Map<String, Optional<List<MMethod>>> methodsByName = new ConcurrentHashMap<>();
 
         MClass(IClassInfo icls, IMappingFile.IClass mcls) {
             if (icls == null && mcls == null)
@@ -331,6 +356,19 @@ public Optional<MMethod> getMethod(String name, String desc) {
             return this.methods.computeIfAbsent(name + desc, k -> Optional.empty());
         }
 
+        Optional<List<MMethod>> getMethods(String name) {
+            return this.methodsByName.computeIfAbsent(name, k -> {
+                List<MMethod> mtds = new ArrayList<>();
+                for (Optional<MMethod> opt : this.getMethods()) {
+                    MMethod mtd = opt.orElse(null);
+                    if (mtd == null || !k.equals(mtd.getName()))
+                        continue;
+                    mtds.add(mtd);
+                }
+                return mtds.isEmpty() ? Optional.<List<MMethod>>empty() : Optional.of(mtds);
+            });
+        }
+
         @Override
         public String toString() {
             return getName();
diff --git a/src/main/java/net/minecraftforge/fart/internal/EntryImpl.java b/src/main/java/net/minecraftforge/fart/internal/EntryImpl.java
index a9a9dc5..44233b0 100644
--- a/src/main/java/net/minecraftforge/fart/internal/EntryImpl.java
+++ b/src/main/java/net/minecraftforge/fart/internal/EntryImpl.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import net.minecraftforge.fart.api.Transformer;
diff --git a/src/main/java/net/minecraftforge/fart/internal/FFLineFixer.java b/src/main/java/net/minecraftforge/fart/internal/FFLineFixer.java
index 03fc943..05920e8 100644
--- a/src/main/java/net/minecraftforge/fart/internal/FFLineFixer.java
+++ b/src/main/java/net/minecraftforge/fart/internal/FFLineFixer.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import java.io.File;
diff --git a/src/main/java/net/minecraftforge/fart/internal/HashFunction.java b/src/main/java/net/minecraftforge/fart/internal/HashFunction.java
index a1f371f..a1c9bfb 100644
--- a/src/main/java/net/minecraftforge/fart/internal/HashFunction.java
+++ b/src/main/java/net/minecraftforge/fart/internal/HashFunction.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/net/minecraftforge/fart/internal/IdentifierFixer.java b/src/main/java/net/minecraftforge/fart/internal/IdentifierFixer.java
index d16457b..7cda721 100644
--- a/src/main/java/net/minecraftforge/fart/internal/IdentifierFixer.java
+++ b/src/main/java/net/minecraftforge/fart/internal/IdentifierFixer.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import java.util.HashMap;
@@ -46,7 +45,7 @@ private String fixName(String name, int index) {
                         if ((char)0x2603 == name.charAt(0))
                             valid = false;
                     } else {
-                        if (name.isEmpty() || !Character.isJavaIdentifierStart(name.charAt(0)))
+                        if (!Character.isJavaIdentifierStart(name.charAt(0)))
                             valid = false;
                         else  {
                             for (int x = 1; x < name.length(); x++) {
diff --git a/src/main/java/net/minecraftforge/fart/internal/OptionalChangeTransformer.java b/src/main/java/net/minecraftforge/fart/internal/OptionalChangeTransformer.java
index d48c4c7..2f86518 100644
--- a/src/main/java/net/minecraftforge/fart/internal/OptionalChangeTransformer.java
+++ b/src/main/java/net/minecraftforge/fart/internal/OptionalChangeTransformer.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import net.minecraftforge.fart.api.Transformer;
diff --git a/src/main/java/net/minecraftforge/fart/internal/Pair.java b/src/main/java/net/minecraftforge/fart/internal/Pair.java
index bc102d9..def5e95 100644
--- a/src/main/java/net/minecraftforge/fart/internal/Pair.java
+++ b/src/main/java/net/minecraftforge/fart/internal/Pair.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 class Pair<L, R> {
diff --git a/src/main/java/net/minecraftforge/fart/internal/ParameterAnnotationFixer.java b/src/main/java/net/minecraftforge/fart/internal/ParameterAnnotationFixer.java
index 5b901b6..4c6ca52 100644
--- a/src/main/java/net/minecraftforge/fart/internal/ParameterAnnotationFixer.java
+++ b/src/main/java/net/minecraftforge/fart/internal/ParameterAnnotationFixer.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import org.objectweb.asm.AnnotationVisitor;
diff --git a/src/main/java/net/minecraftforge/fart/internal/RecordFixer.java b/src/main/java/net/minecraftforge/fart/internal/RecordFixer.java
index 2e252cd..7f29973 100644
--- a/src/main/java/net/minecraftforge/fart/internal/RecordFixer.java
+++ b/src/main/java/net/minecraftforge/fart/internal/RecordFixer.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import java.util.LinkedHashMap;
diff --git a/src/main/java/net/minecraftforge/fart/internal/RenamerBuilder.java b/src/main/java/net/minecraftforge/fart/internal/RenamerBuilder.java
index 1709c50..04e98a8 100644
--- a/src/main/java/net/minecraftforge/fart/internal/RenamerBuilder.java
+++ b/src/main/java/net/minecraftforge/fart/internal/RenamerBuilder.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import net.minecraftforge.fart.api.ClassProvider;
diff --git a/src/main/java/net/minecraftforge/fart/internal/RenamerImpl.java b/src/main/java/net/minecraftforge/fart/internal/RenamerImpl.java
index dd47b67..7b286cf 100644
--- a/src/main/java/net/minecraftforge/fart/internal/RenamerImpl.java
+++ b/src/main/java/net/minecraftforge/fart/internal/RenamerImpl.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import java.io.File;
@@ -13,7 +12,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -39,6 +37,7 @@ class RenamerImpl implements Renamer {
     private final List<ClassProvider> classProviders;
     private final int threads;
     private final Consumer<String> logger;
+    @SuppressWarnings("unused")
     private final Consumer<String> debug;
     private final List<String> ignoreJarPathPrefix;
     private boolean setup = false;
@@ -74,12 +73,16 @@ public void run(File input, File output) {
         if (!this.setup)
             this.setup();
 
-        input = Objects.requireNonNull(input).getAbsoluteFile();
-        output = Objects.requireNonNull(output).getAbsoluteFile();
-
+        if (input == null)
+            throw new IllegalArgumentException("input argument can't be null");
+        if (output == null)
+            throw new IllegalArgumentException("output argument can't be null");
         if (!input.exists())
             throw new IllegalArgumentException("Input file not found: " + input.getAbsolutePath());
 
+        input = input.getAbsoluteFile();
+        output = output.getAbsoluteFile();
+
         logger.accept("Reading Input: " + input.getAbsolutePath());
         // Read everything from the input jar!
         List<Entry> oldEntries = new ArrayList<>();
@@ -142,7 +145,7 @@ else if (name.equals(MANIFEST_NAME))
             newEntries.addAll(excludedEntries);
 
             logger.accept("Adding extras");
-            transformers.stream().forEach(t -> newEntries.addAll(t.getExtras()));
+            transformers.forEach(t -> newEntries.addAll(t.getExtras()));
 
             Set<String> seen = new HashSet<>();
             String dupes = newEntries.stream().map(Entry::getName)
@@ -161,7 +164,7 @@ else if (name.equals(MANIFEST_NAME))
 
             // We care about stable output, so sort, and single thread write.
             logger.accept("Sorting");
-            Collections.sort(newEntries, this::compare);
+            newEntries.sort(this::compare);
 
             if (!output.getParentFile().exists())
                 output.getParentFile().mkdirs();
@@ -170,6 +173,9 @@ else if (name.equals(MANIFEST_NAME))
             logger.accept("Writing Output: " + output.getAbsolutePath());
             try (FileOutputStream fos = new FileOutputStream(output);
                 ZipOutputStream zos = new ZipOutputStream(fos)) {
+                // Explicitly set compression level because of potential differences based on environment.
+                // See https://github.com/MinecraftForge/JarSplitter/pull/2
+                zos.setLevel(6);
 
                 for (Entry e : newEntries) {
                     String name = e.getName();
diff --git a/src/main/java/net/minecraftforge/fart/internal/RenamingTransformer.java b/src/main/java/net/minecraftforge/fart/internal/RenamingTransformer.java
index 7dad694..33bbf97 100644
--- a/src/main/java/net/minecraftforge/fart/internal/RenamingTransformer.java
+++ b/src/main/java/net/minecraftforge/fart/internal/RenamingTransformer.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import net.minecraftforge.fart.api.ClassProvider;
@@ -80,6 +79,6 @@ public Collection<? extends Entry> getExtras() {
     }
 
     void storeNames(String className, String methodName, String methodDescriptor, Collection<String> paramNames) {
-        abstractParams.add(className + ' ' + methodName + ' ' + methodDescriptor + ' ' + paramNames.stream().collect(Collectors.joining(" ")));
+        abstractParams.add(className + ' ' + methodName + ' ' + methodDescriptor + ' ' + String.join(" ", paramNames));
     }
 }
diff --git a/src/main/java/net/minecraftforge/fart/internal/SignatureStripperTransformer.java b/src/main/java/net/minecraftforge/fart/internal/SignatureStripperTransformer.java
index bdab882..a4c576b 100644
--- a/src/main/java/net/minecraftforge/fart/internal/SignatureStripperTransformer.java
+++ b/src/main/java/net/minecraftforge/fart/internal/SignatureStripperTransformer.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import net.minecraftforge.fart.api.SignatureStripperConfig;
diff --git a/src/main/java/net/minecraftforge/fart/internal/SortedClassProvider.java b/src/main/java/net/minecraftforge/fart/internal/SortedClassProvider.java
index fc6d6a6..71482df 100644
--- a/src/main/java/net/minecraftforge/fart/internal/SortedClassProvider.java
+++ b/src/main/java/net/minecraftforge/fart/internal/SortedClassProvider.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import net.minecraftforge.fart.api.ClassProvider;
diff --git a/src/main/java/net/minecraftforge/fart/internal/SourceFixer.java b/src/main/java/net/minecraftforge/fart/internal/SourceFixer.java
index 696477b..50ca587 100644
--- a/src/main/java/net/minecraftforge/fart/internal/SourceFixer.java
+++ b/src/main/java/net/minecraftforge/fart/internal/SourceFixer.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import net.minecraftforge.fart.api.SourceFixerConfig;
diff --git a/src/main/java/net/minecraftforge/fart/internal/Util.java b/src/main/java/net/minecraftforge/fart/internal/Util.java
index fb77625..54a02fc 100644
--- a/src/main/java/net/minecraftforge/fart/internal/Util.java
+++ b/src/main/java/net/minecraftforge/fart/internal/Util.java
@@ -2,7 +2,6 @@
  * Copyright (c) Forge Development LLC and contributors
  * SPDX-License-Identifier: LGPL-2.1-only
  */
-
 package net.minecraftforge.fart.internal;
 
 import java.io.ByteArrayOutputStream;