Merge pull request #52 from AlexProgrammerDE/main

Added more method call downgraders

Author: RaphiMC

src/main/java/net/raphimc/javadowngrader/transformer/j11/Java12ToJava11.java

@@ -20,6 +20,7 @@
 import net.raphimc.javadowngrader.transformer.DowngradingTransformer;
 import net.raphimc.javadowngrader.transformer.j11.methodcallreplacer.ClassArrayTypeMCR;
 import net.raphimc.javadowngrader.transformer.j11.methodcallreplacer.CompletableFutureExceptionallyAsyncMCR;
+import net.raphimc.javadowngrader.transformer.j11.methodcallreplacer.StringDescribeConstableMCR;
 import org.objectweb.asm.Opcodes;
 
 public class Java12ToJava11 extends DowngradingTransformer {
@@ -30,6 +31,8 @@ public Java12ToJava11() {
         this.addMethodCallReplacer(Opcodes.INVOKEVIRTUAL, "java/util/concurrent/CompletableFuture", "exceptionallyAsync", "(Ljava/util/function/Function;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", new CompletableFutureExceptionallyAsyncMCR());
 
         this.addMethodCallReplacer(Opcodes.INVOKEVIRTUAL, "java/lang/Class", "arrayType", "()Ljava/lang/Class;", new ClassArrayTypeMCR());
+
+        this.addMethodCallReplacer(Opcodes.INVOKEVIRTUAL, "java/lang/String", "describeConstable", "()Ljava/util/Optional;", new StringDescribeConstableMCR());
     }
 
 }

src/main/java/net/raphimc/javadowngrader/transformer/j11/methodcallreplacer/StringDescribeConstableMCR.java

@@ -0,0 +1,42 @@
+/*
+ * This file is part of JavaDowngrader - https://github.com/RaphiMC/JavaDowngrader
+ * Copyright (C) 2023-2024 RK_01/RaphiMC and contributors
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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/>.
+ */
+package net.raphimc.javadowngrader.transformer.j11.methodcallreplacer;
+
+import net.raphimc.javadowngrader.RuntimeDepCollector;
+import net.raphimc.javadowngrader.transformer.DowngradeResult;
+import net.raphimc.javadowngrader.transformer.MethodCallReplacer;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+
+public class StringDescribeConstableMCR implements MethodCallReplacer {
+
+    @Override
+    public InsnList getReplacement(ClassNode classNode, MethodNode method, String originalName, String originalDesc, RuntimeDepCollector depCollector, DowngradeResult result) {
+        final InsnList replacement = new InsnList();
+
+        // String
+        replacement.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "java/util/Optional", "of", "(Ljava/lang/String;)Ljava/util/Optional;"));
+        // Optional
+
+        return replacement;
+    }
+
+}

src/main/java/net/raphimc/javadowngrader/transformer/j9/Java10ToJava9.java

@@ -39,6 +39,8 @@ public Java10ToJava9() {
         this.addMethodCallReplacer(Opcodes.INVOKEVIRTUAL, "java/util/Optional", "orElseThrow", "()Ljava/lang/Object;", new OptionalOrElseThrowMCR());
 
         this.addMethodCallReplacer(Opcodes.INVOKESTATIC, "java/net/URLEncoder", "encode", "(Ljava/lang/String;Ljava/nio/charset/Charset;)Ljava/lang/String;", new URLEncoderEncodeMCR());
+
+        this.addMethodCallReplacer(Opcodes.INVOKEVIRTUAL, "java/io/ByteArrayOutputStream", "toString", "(Ljava/nio/charset/Charset;)Ljava/lang/String;", new ByteArrayOutputStreamToStringMCR());
     }
 
 }

src/main/java/net/raphimc/javadowngrader/transformer/j9/methodcallreplacer/ByteArrayOutputStreamToStringMCR.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of JavaDowngrader - https://github.com/RaphiMC/JavaDowngrader
+ * Copyright (C) 2023-2024 RK_01/RaphiMC and contributors
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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/>.
+ */
+package net.raphimc.javadowngrader.transformer.j9.methodcallreplacer;
+
+import net.raphimc.javadowngrader.RuntimeDepCollector;
+import net.raphimc.javadowngrader.transformer.DowngradeResult;
+import net.raphimc.javadowngrader.transformer.MethodCallReplacer;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+
+public class ByteArrayOutputStreamToStringMCR implements MethodCallReplacer {
+
+    @Override
+    public InsnList getReplacement(ClassNode classNode, MethodNode methodNode, String originalName, String originalDesc, RuntimeDepCollector depCollector, DowngradeResult result) {
+        final InsnList replacement = new InsnList();
+
+        // ByteArrayOutputStream Charset
+        replacement.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/nio/charset/Charset", "name", "()Ljava/lang/String;"));
+        // ByteArrayOutputStream String
+        replacement.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/io/ByteArrayOutputStream", "toString", "(Ljava/lang/String;)Ljava/lang/String;"));
+        // String
+
+        return replacement;
+    }
+
+}