Add option to disable generation of abstract param file (#27)

Author: Matyrobbrt

src/main/java/net/minecraftforge/fart/Main.java

@@ -43,6 +43,7 @@ public static void main(String[] args) throws IOException {
         OptionSpec<Integer> threadsO = parser.accepts("threads", "Number of threads to use, defaults to processor count.").withRequiredArg().ofType(Integer.class).defaultsTo(Runtime.getRuntime().availableProcessors());
         OptionSpec<File> ffLinesO = parser.accepts("ff-line-numbers", "Applies line number corrections from Fernflower.").withRequiredArg().ofType(File.class);
         OptionSpec<Void> reverseO = parser.accepts("reverse", "Reverse provided mapping file before applying");
+        OptionSpec<Void> disableAbstractParam = parser.accepts("disable-abstract-param", "Disables collection of names of parameters of abstract methods for FernFlower");
         OptionSet options;
         try {
             options = parser.parse(expandArgs(args));
@@ -105,7 +106,7 @@ public static void main(String[] args) throws IOException {
                 mappings = mappings.reverse();
             }
 
-            builder.add(Transformer.renamerFactory(mappings));
+            builder.add(Transformer.renamerFactory(mappings, !options.has(disableAbstractParam)));
         } else {
             log.accept("Names: null");
         }

src/main/java/net/minecraftforge/fart/api/Renamer.java

@@ -114,6 +114,13 @@ public interface Builder {
          */
         Builder debug(Consumer<String> debug);
 
+        /**
+         * Sets whether to collect parameter names of abstract methods for FernFlower. Defaults to {@code true}.
+         * @param collectAbstractParams whether to collect parameter names of abstract methods for FernFlower
+         * @return this builder
+         */
+        Builder setCollectAbstractParams(boolean collectAbstractParams);
+
         /**
          * Builds the {@link Renamer} instance based on this configured builder.
          * The built Renamer is guaranteed to be reusable for multiple runs.

src/main/java/net/minecraftforge/fart/api/Transformer.java

@@ -70,10 +70,24 @@ default Collection<? extends Entry> getExtras() {
      * Create a transformer that applies mappings as a transformation.
      *
      * @param map the mapping information to remap with
+     * @param collectAbstractParams whether to collect abstract parameter names for FernFlower
      * @return a factory for a renaming transformer
      */
-    public static Factory renamerFactory(IMappingFile map) {
-        return ctx -> new RenamingTransformer(ctx.getClassProvider(), map, ctx.getLog());
+    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);
     }
 
     /**

src/main/java/net/minecraftforge/fart/internal/RenamerBuilder.java

@@ -27,6 +27,7 @@ public class RenamerBuilder implements Builder {
     private boolean withJvmClasspath = false;
     private Consumer<String> logger = System.out::println;
     private Consumer<String> debug = s -> {};
+    private boolean collectAbstractParams = true;
 
     @Override
     public Builder lib(File value) {
@@ -37,7 +38,7 @@ public Builder lib(File value) {
     @Override
     public Builder map(File value) {
         try {
-            add(Transformer.renamerFactory(IMappingFile.load(value)));
+            add(Transformer.renamerFactory(IMappingFile.load(value), collectAbstractParams));
         } catch (IOException e) {
             throw new RuntimeException("Could not map file: " + value.getAbsolutePath(), e);
         }
@@ -87,6 +88,12 @@ public Builder debug(Consumer<String> debug) {
         return this;
     }
 
+    @Override
+    public Builder setCollectAbstractParams(boolean collectAbstractParams) {
+        this.collectAbstractParams = collectAbstractParams;
+        return this;
+    }
+
     @Override
     public Renamer build() {
         List<ClassProvider> classProviders = new ArrayList<>(this.classProviders);

src/main/java/net/minecraftforge/fart/internal/RenamingTransformer.java

@@ -26,8 +26,14 @@ public class RenamingTransformer implements Transformer {
     private static final String ABSTRACT_FILE = "fernflower_abstract_parameter_names.txt";
     private final EnhancedRemapper remapper;
     private final Set<String> abstractParams = ConcurrentHashMap.newKeySet();
+    private final boolean collectAbstractParams;
 
     public RenamingTransformer(ClassProvider classProvider, IMappingFile map, Consumer<String> log) {
+        this(classProvider, map, log, true);
+    }
+
+    public RenamingTransformer(ClassProvider classProvider, IMappingFile map, Consumer<String> log, boolean collectAbstractParams) {
+        this.collectAbstractParams = collectAbstractParams;
         this.remapper = new EnhancedRemapper(classProvider, map, log);
     }
 
@@ -57,10 +63,10 @@ public ResourceEntry process(ResourceEntry entry) {
 
     @Override
     public Collection<? extends Entry> getExtras() {
-        if (abstractParams.isEmpty())
+        if (abstractParams.isEmpty() || !collectAbstractParams)
             return Collections.emptyList();
         byte[] data = abstractParams.stream().sorted().collect(Collectors.joining("\n")).getBytes(StandardCharsets.UTF_8);
-        return Arrays.asList(ResourceEntry.create(ABSTRACT_FILE, Entry.STABLE_TIMESTAMP, data));
+        return Collections.singletonList(ResourceEntry.create(ABSTRACT_FILE, Entry.STABLE_TIMESTAMP, data));
     }
 
     void storeNames(String className, String methodName, String methodDescriptor, Collection<String> paramNames) {