Switch to NeoForged SRGUtils and repackage to net.neoforged.art

LICENSE-header.txt

@@ -1,2 +1,2 @@
-Copyright (c) Forge Development LLC and contributors
+Copyright (c) NeoForged and contributors
 SPDX-License-Identifier: LGPL-2.1-only

build.gradle

@@ -32,15 +32,15 @@ compileJava.options.encoding = 'UTF-8'
 ext {
     TITLE = 'Auto Renaming Tool'
     MANIFEST = manifest{
-        attributes('Main-Class': 'net.minecraftforge.fart.Main')
+        attributes('Main-Class': 'net.neoforged.art.Main')
         attributes([
             'Specification-Title':      'AutoRenamingTool',
             'Specification-Vendor':     'Neo Forged',
             'Specification-Version':    gradleutils.gitInfo.tag,
             'Implementation-Title':     'ART',
             'Implementation-Version':   project.version,
             'Implementation-Vendor':    'NeoForged'
-        ] as LinkedHashMap, 'net/minecraftforge/fart/')
+        ] as LinkedHashMap, 'net/neoforged/art/')
     }
     INITIAL_CHANGELOG_TAG = '1.0'
 }
@@ -55,13 +55,14 @@ test {
 }
 
 license {
+    skipExistingHeaders = true
     header = file('LICENSE-header.txt')
     ext.project = TITLE
 }
 
 dependencies {
     implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
-    api 'net.minecraftforge:srgutils:0.5.1'
+    api 'net.neoforged:srgutils:1.0.0'
     api 'net.neoforged.installertools:cli-utils:2.1.2'
     implementation 'org.ow2.asm:asm:9.5'
     implementation 'org.ow2.asm:asm-commons:9.5'
@@ -92,13 +93,13 @@ shadowJar {
 
     def relocations = [
             'org.objectweb.asm',
-            'net.minecraftforge.srgutils',
+            'net.neoforged.srgutils',
             'joptsimple',
             'net.neoforged.cliutils'
     ]
 
     relocations.forEach {
-        relocate it, "net.minecraftforge.fart.relocated.$it"
+        relocate it, "net.neoforged.art.relocated.$it"
     }
 }
 

src/main/java/net/minecraftforge/fart/Main.java → src/main/java/net/neoforged/art/Main.java

@@ -6,27 +6,26 @@
 package net.minecraftforge.fart;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.io.FileOutputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
-
 import joptsimple.OptionException;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
-import net.minecraftforge.fart.api.IdentifierFixerConfig;
-import net.minecraftforge.fart.api.Renamer;
-import net.minecraftforge.fart.api.SignatureStripperConfig;
-import net.minecraftforge.fart.api.SourceFixerConfig;
-import net.minecraftforge.fart.api.Transformer;
-import net.minecraftforge.srgutils.IMappingFile;
+import net.neoforged.art.api.IdentifierFixerConfig;
+import net.neoforged.art.api.Renamer;
+import net.neoforged.art.api.SignatureStripperConfig;
+import net.neoforged.art.api.SourceFixerConfig;
+import net.neoforged.art.api.Transformer;
+import net.neoforged.srgutils.IMappingFile;
 
 public class Main {
     public static void main(String[] args) throws IOException {

src/main/java/net/minecraftforge/fart/api/ClassProvider.java → src/main/java/net/neoforged/art/api/ClassProvider.java

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.api;
+package net.neoforged.art.api;
 
-import net.minecraftforge.fart.internal.ClassLoaderClassProvider;
-import net.minecraftforge.fart.internal.ClassProviderBuilderImpl;
+import net.neoforged.art.internal.ClassLoaderClassProvider;
+import net.neoforged.art.internal.ClassProviderBuilderImpl;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;

src/main/java/net/minecraftforge/fart/api/IdentifierFixerConfig.java → src/main/java/net/neoforged/art/api/IdentifierFixerConfig.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.api;
+package net.neoforged.art.api;
 
 /**
  * Identifier transformation strategy for {@link Transformer#identifierFixerFactory(IdentifierFixerConfig)}.

src/main/java/net/minecraftforge/fart/api/Renamer.java → src/main/java/net/neoforged/art/api/Renamer.java

@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.api;
+package net.neoforged.art.api;
 
 import java.io.Closeable;
 import java.io.File;
 import java.util.function.Consumer;
 
-import net.minecraftforge.fart.internal.RenamerBuilder;
+import net.neoforged.art.internal.RenamerBuilder;
 
 /**
  * A {@code Renamer} is used to run generic transformers on a JAR file.

src/main/java/net/minecraftforge/fart/api/SignatureStripperConfig.java → src/main/java/net/neoforged/art/api/SignatureStripperConfig.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.api;
+package net.neoforged.art.api;
 
 /**
  * Signature stripper transformation strategy for {@link Transformer#signatureStripperFactory(SignatureStripperConfig)}.

src/main/java/net/minecraftforge/fart/api/SourceFixerConfig.java → src/main/java/net/neoforged/art/api/SourceFixerConfig.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.api;
+package net.neoforged.art.api;
 
 /**
  * Source file naming strategy for {@link Transformer#sourceFixerFactory(SourceFixerConfig)}.

src/main/java/net/minecraftforge/fart/api/Transformer.java → src/main/java/net/neoforged/art/api/Transformer.java

@@ -3,23 +3,22 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.api;
+package net.neoforged.art.api;
 
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.function.Consumer;
 import java.util.zip.ZipEntry;
-
-import net.minecraftforge.fart.internal.FFLineFixer;
-import net.minecraftforge.fart.internal.IdentifierFixer;
-import net.minecraftforge.fart.internal.ParameterAnnotationFixer;
-import net.minecraftforge.fart.internal.EntryImpl;
-import net.minecraftforge.fart.internal.RecordFixer;
-import net.minecraftforge.fart.internal.RenamingTransformer;
-import net.minecraftforge.fart.internal.SignatureStripperTransformer;
-import net.minecraftforge.fart.internal.SourceFixer;
-import net.minecraftforge.srgutils.IMappingFile;
+import net.neoforged.art.internal.EntryImpl;
+import net.neoforged.art.internal.FFLineFixer;
+import net.neoforged.art.internal.IdentifierFixer;
+import net.neoforged.art.internal.ParameterAnnotationFixer;
+import net.neoforged.art.internal.RecordFixer;
+import net.neoforged.art.internal.RenamingTransformer;
+import net.neoforged.art.internal.SignatureStripperTransformer;
+import net.neoforged.art.internal.SourceFixer;
+import net.neoforged.srgutils.IMappingFile;
 import org.objectweb.asm.Type;
 
 import static java.util.Objects.requireNonNull;
@@ -87,19 +86,6 @@ static Factory renamerFactory(IMappingFile map, boolean collectAbstractParams) {
         return ctx -> new RenamingTransformer(ctx.getClassProvider(), map, ctx.getLog(), collectAbstractParams);
     }
 
-    /**
-     * Create a transformer that applies mappings as a transformation.
-     *
-     * @param map the mapping information to remap with
-     * @return a factory for a renaming transformer
-     *
-     * @deprecated use {@link #renamerFactory(IMappingFile, boolean)} insteead
-     */
-    @Deprecated
-    static Factory renamerFactory(IMappingFile map) {
-        return renamerFactory(map, true);
-    }
-
     /**
      * Create a transformer that renames any local variables that are not valid java identifiers.
      *

src/main/java/net/minecraftforge/fart/internal/AsyncHelper.java → src/main/java/net/neoforged/art/internal/AsyncHelper.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/net/minecraftforge/fart/internal/ClassLoaderClassProvider.java → src/main/java/net/neoforged/art/internal/ClassLoaderClassProvider.java

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
-import net.minecraftforge.fart.api.ClassProvider;
+import net.neoforged.art.api.ClassProvider;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;

src/main/java/net/minecraftforge/fart/internal/ClassProviderBuilderImpl.java → src/main/java/net/neoforged/art/internal/ClassProviderBuilderImpl.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
 import java.io.IOException;
 import java.nio.file.FileSystem;
@@ -18,7 +18,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Stream;
 
-import net.minecraftforge.fart.api.ClassProvider;
+import net.neoforged.art.api.ClassProvider;
 
 public class ClassProviderBuilderImpl implements ClassProvider.Builder {
     private final List<FileSystem> fileSystems = new ArrayList<>();

src/main/java/net/minecraftforge/fart/internal/ClassProviderImpl.java → src/main/java/net/neoforged/art/internal/ClassProviderImpl.java

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
-import net.minecraftforge.fart.api.ClassProvider;
+import net.neoforged.art.api.ClassProvider;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.Type;

src/main/java/net/minecraftforge/fart/internal/EnhancedClassRemapper.java → src/main/java/net/neoforged/art/internal/EnhancedClassRemapper.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/net/minecraftforge/fart/internal/EnhancedRemapper.java → src/main/java/net/neoforged/art/internal/EnhancedRemapper.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14,20 +14,20 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
-
+import net.neoforged.art.api.ClassProvider;
+import net.neoforged.art.api.ClassProvider.IClassInfo;
+import net.neoforged.art.api.ClassProvider.IFieldInfo;
+import net.neoforged.art.api.ClassProvider.IMethodInfo;
+import net.neoforged.srgutils.IMappingFile;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Handle;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.Remapper;
 
-import net.minecraftforge.fart.api.ClassProvider;
-import net.minecraftforge.fart.api.ClassProvider.IClassInfo;
-import net.minecraftforge.fart.api.ClassProvider.IFieldInfo;
-import net.minecraftforge.fart.api.ClassProvider.IMethodInfo;
-import net.minecraftforge.srgutils.IMappingFile;
-
-import static org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.ACC_INTERFACE;
+import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
+import static org.objectweb.asm.Opcodes.ACC_STATIC;
 
 class EnhancedRemapper extends Remapper {
     private final ClassProvider classProvider;

src/main/java/net/minecraftforge/fart/internal/EntryImpl.java → src/main/java/net/neoforged/art/internal/EntryImpl.java

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
-import net.minecraftforge.fart.api.Transformer;
+import net.neoforged.art.api.Transformer;
 
 public abstract class EntryImpl implements Transformer.Entry {
     private final String name;

src/main/java/net/minecraftforge/fart/internal/FFLineFixer.java → src/main/java/net/neoforged/art/internal/FFLineFixer.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -17,12 +17,12 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import net.neoforged.art.api.Transformer;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
-import net.minecraftforge.fart.api.Transformer;
 
 public final class FFLineFixer implements Transformer {
     private final Map<String, NavigableMap<Integer, Integer>> classes = new HashMap<>();

src/main/java/net/minecraftforge/fart/internal/IdentifierFixer.java → src/main/java/net/neoforged/art/internal/IdentifierFixer.java

@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import net.minecraftforge.fart.api.IdentifierFixerConfig;
+import net.neoforged.art.api.IdentifierFixerConfig;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;

src/main/java/net/minecraftforge/fart/internal/JavadoctorRemapper.java → src/main/java/net/neoforged/art/internal/JavadoctorRemapper.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
 import net.neoforged.javadoctor.spec.ClassJavadoc;
 import net.neoforged.javadoctor.spec.DocReferences;

src/main/java/net/minecraftforge/fart/internal/OptionalChangeTransformer.java → src/main/java/net/neoforged/art/internal/OptionalChangeTransformer.java

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
-import net.minecraftforge.fart.api.Transformer;
+import net.neoforged.art.api.Transformer;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;

src/main/java/net/minecraftforge/fart/internal/Pair.java → src/main/java/net/neoforged/art/internal/Pair.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
 class Pair<L, R> {
     private final L left;

src/main/java/net/minecraftforge/fart/internal/ParameterAnnotationFixer.java → src/main/java/net/neoforged/art/internal/ParameterAnnotationFixer.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassVisitor;

src/main/java/net/minecraftforge/fart/internal/RecordFixer.java → src/main/java/net/neoforged/art/internal/RecordFixer.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.minecraftforge.fart.internal;
+package net.neoforged.art.internal;
 
 import java.util.LinkedHashMap;
 import java.util.Map;