Share DowngradeResult

Author: Lenni0451

src/main/java/net/raphimc/javadowngrader/JavaDowngrader.java

@@ -62,7 +62,7 @@ public class JavaDowngrader {
      *
      * @param classNode     The class to downgrade
      * @param targetVersion The target Java version
-     * @return The downgrade result
+     * @return The {@link DowngradeResult}
      * @see ClassNode
      */
     public static DowngradeResult downgrade(final ClassNode classNode, final int targetVersion) {
@@ -76,16 +76,15 @@ public static DowngradeResult downgrade(final ClassNode classNode, final int tar
      * @param targetVersion The target Java version
      * @param depCollector  The {@link RuntimeDepCollector} to use to collect runtime dependencies. Check the javadoc
      *                      of {@link RuntimeDepCollector} for more info.
-     * @return The downgrade result
+     * @return The {@link DowngradeResult}
      * @see ClassNode
      * @see RuntimeDepCollector
      */
     public static DowngradeResult downgrade(final ClassNode classNode, final int targetVersion, final RuntimeDepCollector depCollector) {
-        DowngradeResult result = new DowngradeResult();
+        final DowngradeResult result = new DowngradeResult();
         for (DowngradingTransformer transformer : TRANSFORMER) {
             if (transformer.getTargetVersion() >= targetVersion && (classNode.version & 0xFF) > transformer.getTargetVersion()) {
-                DowngradeResult transformerResult = transformer.transform(classNode, depCollector);
-                result.add(transformerResult);
+                transformer.transform(classNode, depCollector, result);
             }
         }
         return result;

src/main/java/net/raphimc/javadowngrader/transformer/DowngradingTransformer.java

@@ -79,17 +79,16 @@ protected void addClassReplacement(final String oldName, final String newName, S
         this.classReplacements.put(oldName, classes);
     }
 
-    public void transform(final ClassNode classNode) {
-        transform(classNode, RuntimeDepCollector.NULL);
+    public void transform(final ClassNode classNode, final DowngradeResult result) {
+        transform(classNode, RuntimeDepCollector.NULL, result);
     }
 
-    public DowngradeResult transform(final ClassNode classNode, final RuntimeDepCollector depCollector) {
-        DowngradeResult result = new DowngradeResult();
+    public void transform(final ClassNode classNode, final RuntimeDepCollector depCollector, final DowngradeResult result) {
         if ((classNode.version & 0xFF) > this.sourceVersion) {
             throw new IllegalArgumentException("Input class version is higher than supported");
         }
         if ((classNode.version & 0xFF) <= this.targetVersion) {
-            return result;
+            return;
         }
 
         this.preTransform(classNode, result);
@@ -166,6 +165,7 @@ public String map(String internalName) {
                     if (classes == null) {
                         return internalName;
                     }
+                    result.setRequiresStackMapFrames();
                     classes.forEach(depCollector);
                     return classes.get(0);
                 }
@@ -189,7 +189,6 @@ public String map(String internalName) {
         this.postTransform(classNode, result);
 
         classNode.version = this.targetVersion;
-        return result;
     }
 
     protected void preTransform(final ClassNode classNode, final DowngradeResult result) {