Improve StringEncryptTransformer

genesis/src/main/kotlin/net/spartanb312/genesis/kotlin/extensions/insn/Method.kt

@@ -14,10 +14,7 @@ import org.objectweb.asm.tree.MethodNode
  */
 @BuilderDSL
 fun InsnListBuilder.INVOKESTATIC(owner: String, name: String, desc: String, isInterface: Boolean = false) {
-    require(!isInterface) {
-        "INVOKESTATIC isInterface should always be false"
-    }
-    +MethodInsnNode(Opcodes.INVOKESTATIC, owner, name, desc, false)
+    +MethodInsnNode(Opcodes.INVOKESTATIC, owner, name, desc, isInterface)
 }
 
 @BuilderDSL

grunt-authenticator/src/main/kotlin/net/spartanb312/grunt/auth/process/RemoteLoaderTransformer.kt

@@ -17,6 +17,7 @@ import net.spartanb312.grunt.process.transformers.encrypt.ConstPoolEncryptTransf
 import net.spartanb312.grunt.process.transformers.encrypt.NumberEncryptTransformer
 import net.spartanb312.grunt.process.transformers.encrypt.StringEncryptTransformer
 import net.spartanb312.grunt.process.transformers.encrypt.number.NumberEncryptorClassic
+import net.spartanb312.grunt.process.transformers.redirect.InvokeDynamicTransformer
 import net.spartanb312.grunt.process.transformers.rename.ClassRenameTransformer
 import net.spartanb312.grunt.utils.extensions.appendAnnotation
 import net.spartanb312.grunt.utils.extensions.hasAnnotation
@@ -270,9 +271,9 @@ object RemoteLoaderTransformer : Transformer("RemoteLoader", Category.Miscellane
                             is ConstPoolEncryptTransformer.ConstRef.StringRef -> {
                                 val key = Random.nextInt(0x8, 0x800)
                                 val methodName = getRandomString(10)
-                                val decryptMethod = StringEncryptTransformer.createDecryptMethod(methodName, key)
+                                val decryptMethod = InvokeDynamicTransformer.createDecryptMethod(methodName, key)
                                 remoteCompanion.methods.add(decryptMethod)
-                                LDC(StringEncryptTransformer.encrypt(ref.value, key))
+                                LDC(InvokeDynamicTransformer.encrypt(ref.value, key))
                                 +MethodInsnNode(
                                     Opcodes.INVOKESTATIC, remoteCompanion.name,
                                     methodName, "(Ljava/lang/String;)Ljava/lang/String;",

grunt-main/src/main/kotlin/net/spartanb312/grunt/process/transformers/encrypt/ConstPoolEncryptTransformer.kt

@@ -7,10 +7,9 @@ import net.spartanb312.grunt.annotation.DISABLE_SCRAMBLE
 import net.spartanb312.grunt.config.setting
 import net.spartanb312.grunt.process.Transformer
 import net.spartanb312.grunt.process.resource.ResourceCache
-import net.spartanb312.grunt.process.transformers.encrypt.StringEncryptTransformer.createDecryptMethod
-import net.spartanb312.grunt.process.transformers.encrypt.StringEncryptTransformer.encrypt
 import net.spartanb312.grunt.process.transformers.encrypt.number.NumberEncryptorClassic
 import net.spartanb312.grunt.process.transformers.misc.NativeCandidateTransformer
+import net.spartanb312.grunt.process.transformers.redirect.InvokeDynamicTransformer
 import net.spartanb312.grunt.process.transformers.rename.ReflectionSupportTransformer
 import net.spartanb312.grunt.utils.count
 import net.spartanb312.grunt.utils.extensions.appendAnnotation
@@ -129,9 +128,9 @@ object ConstPoolEncryptTransformer : Transformer("ConstPollEncrypt", Category.En
                             is ConstRef.StringRef -> {
                                 val key = Random.nextInt(0x8, 0x800)
                                 val methodName = getRandomString(10)
-                                val decryptMethod = createDecryptMethod(methodName, key)
+                                val decryptMethod = InvokeDynamicTransformer.createDecryptMethod(methodName, key)
                                 clazz.methods.add(decryptMethod)
-                                LDC(encrypt(it.value, key))
+                                LDC(InvokeDynamicTransformer.encrypt(it.value, key))
                                 INVOKESTATIC(clazz.name, methodName, "(Ljava/lang/String;)Ljava/lang/String;")
                                 PUTSTATIC(clazz.name, it.field.name, it.field.desc)
                             }