Skip to content

Commit cc0d597

Browse files
committed
fix: Hardcoded excluded methods for UnusedArgTransformer
1 parent 1ffb0fb commit cc0d597

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedArgTransformer.kt

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public class UnusedArgTransformer : Transformer() {
8282
if (invokePartition == null) {
8383
continue@frame
8484
} else if (
85-
!MethodMappingGenerator.isRenamable(classPath, GlobMemberFilter(listOf()), invokePartition)
85+
!MethodMappingGenerator.isRenamable(classPath, excludedMethods, invokePartition)
8686
) {
8787
continue@frame
8888
}
@@ -128,7 +128,7 @@ public class UnusedArgTransformer : Transformer() {
128128
val partition = inheritedMethodSets[MemberRef(insn)]
129129
if (partition == null) {
130130
continue
131-
} else if (!MethodMappingGenerator.isRenamable(classPath, GlobMemberFilter(listOf()), partition)) {
131+
} else if (!MethodMappingGenerator.isRenamable(classPath, excludedMethods, partition)) {
132132
continue
133133
}
134134

@@ -160,7 +160,7 @@ public class UnusedArgTransformer : Transformer() {
160160
): Boolean {
161161
// delete unused int args from the method itself
162162
val partition = inheritedMethodSets[MemberRef(clazz, method)]!!
163-
if (!MethodMappingGenerator.isRenamable(classPath, GlobMemberFilter(listOf()), partition)) {
163+
if (!MethodMappingGenerator.isRenamable(classPath, excludedMethods, partition)) {
164164
return false
165165
}
166166

@@ -180,6 +180,16 @@ public class UnusedArgTransformer : Transformer() {
180180
}
181181

182182
private companion object {
183+
private val excludedMethods = GlobMemberFilter(listOf(
184+
MemberRef("*", "<clinit>", "*"),
185+
MemberRef("*", "<init>", "*"),
186+
MemberRef("*", "main", "*"),
187+
MemberRef("com/sun/opengl/impl/x11/*", "*", "*"),
188+
MemberRef("jaggl/*", "*", "*"),
189+
MemberRef("javax/media/opengl/*", "*", "*"),
190+
MemberRef("*", "quit", "*")
191+
))
192+
183193
private val INT_SORTS = setOf(
184194
Type.BOOLEAN,
185195
Type.BYTE,

0 commit comments

Comments
 (0)