diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt index a1ac5c29c0..5d355eb8d5 100644 --- a/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt +++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt @@ -79,7 +79,7 @@ class AstDeobfuscator(private val modules: List) { } for (root in roots) { - root.printer = Function(printer::print) + root.printer = Function(printer::print).andThen(::stripNewlineAfterPcAnnotation) root.saveAll() } } @@ -102,5 +102,10 @@ class AstDeobfuscator(private val modules: List) { GlTransformer(), EncloseTransformer() ) + private val PC_ANNOTATION_REGEX = Regex("@Pc\\(([0-9]+)\\)\\s+") + + private fun stripNewlineAfterPcAnnotation(s: String): String { + return s.replace(PC_ANNOTATION_REGEX, "@Pc($1) ") + } } }