@@ -35,40 +35,6 @@ abstract class GenerateSrgCsv : ControllableOutputTask() {
35
35
36
36
val srgToOurs = mutableMapOf<String , String >()
37
37
val classes = mutableListOf<ClassMapping <* , * >>()
38
- // classes.addAll(obfToOurs.topLevelClassMappings)
39
- // while (classes.isNotEmpty()) {
40
- // val namedClass = classes[0]
41
- // classes.removeAt(0)
42
- //
43
- // val srgClass = if (namedClass is InnerClassMapping) {
44
- // val namedParentClass = namedClass.parent
45
- // val namedSrgClass = obfToSrg.getClassMapping(namedParentClass.obfuscatedName).orElseThrow()
46
- // namedSrgClass.getInnerClassMapping(namedClass.obfuscatedName).orElseThrow()
47
- // } else {
48
- // classes.addAll(namedClass.innerClassMappings)
49
- // obfToSrg.getClassMapping(namedClass.obfuscatedName).orElseThrow()
50
- // }
51
- //
52
- // if (namedClass.deobfuscatedName.contains("LootDataType")) {
53
- // println(namedClass)
54
- // println(srgClass)
55
- // }
56
- //
57
- // namedClass.fieldMappings.forEach { namedField ->
58
- // val srgField = srgClass.getFieldMapping(namedField.obfuscatedName).orElseThrow()
59
- // srgToOurs[srgField.deobfuscatedName] = namedField.deobfuscatedName
60
- // }
61
- //
62
- // namedClass.methodMappings.forEach { namedMethod ->
63
- // val srgMethod = srgClass.getMethodMapping(namedMethod.obfuscatedName, namedMethod.obfuscatedDescriptor).orElseThrow()
64
- // srgToOurs[srgMethod.deobfuscatedName] = namedMethod.deobfuscatedName
65
- //
66
- // namedMethod.parameterMappings.forEachIndexed { index, namedParam ->
67
- // val srgParam = srgMethod.getParameterMapping(index).orElseThrow()
68
- // srgToOurs[srgParam.deobfuscatedName] = namedParam.deobfuscatedName
69
- // }
70
- // }
71
- // }
72
38
73
39
classes.addAll(obfToSrg.topLevelClassMappings)
74
40
while (classes.isNotEmpty()) {
@@ -117,7 +83,7 @@ abstract class GenerateSrgCsv : ControllableOutputTask() {
117
83
}
118
84
val namedParam = if (srgMethod.obfuscatedName == " <init>" ) {
119
85
// ctors aren't synthetic, no need for fuckery
120
- namedMethod.get().getParameterMapping(srgParam.index)
86
+ namedMethod.get().getParameterMapping(srgParam.index + 1 )
121
87
} else if (params.size > index) {
122
88
Optional .of(params[index])
123
89
} else {
0 commit comments