Skip to content

Commit a1acc70

Browse files
committed
do param prefixes in mapping generation
1 parent d8ef117 commit a1acc70

File tree

3 files changed

+11
-40
lines changed

3 files changed

+11
-40
lines changed

paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/GenerateMappings.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,15 @@ class ParamsMergeHandler : MappingSetMergerHandler {
294294
throw IllegalStateException("Unexpectedly merged method: ${left.fullObfuscatedName}")
295295
}
296296

297+
override fun addRightParameterMapping(
298+
right: MethodParameterMapping,
299+
target: MethodMapping,
300+
context: MergeContext?
301+
): MethodParameterMapping {
302+
// prefix params with _ to avoid conflicts
303+
return target.createParameterMapping(right.index, "_" + right.deobfuscatedName)
304+
}
305+
297306
// Don't take anything from yarn
298307
override fun addRightTopLevelClassMapping(
299308
right: TopLevelClassMapping?,

paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/GenerateSrgCsv.kt

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -35,40 +35,6 @@ abstract class GenerateSrgCsv : ControllableOutputTask() {
3535

3636
val srgToOurs = mutableMapOf<String, String>()
3737
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-
//}
7238

7339
classes.addAll(obfToSrg.topLevelClassMappings)
7440
while (classes.isNotEmpty()) {
@@ -117,7 +83,7 @@ abstract class GenerateSrgCsv : ControllableOutputTask() {
11783
}
11884
val namedParam = if (srgMethod.obfuscatedName == "<init>") {
11985
// ctors aren't synthetic, no need for fuckery
120-
namedMethod.get().getParameterMapping(srgParam.index)
86+
namedMethod.get().getParameterMapping(srgParam.index + 1)
12187
} else if (params.size > index) {
12288
Optional.of(params[index])
12389
} else {

paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/McpConfigTask.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,7 @@ abstract class PrepareBase : ControllableOutputTask() {
212212
content = regex.replace(content) { res ->
213213
val mapping = srgToMojang[res.groupValues[0]]
214214
if (mapping != null) {
215-
if (res.groupValues[0].startsWith("p")) {
216-
return@replace "_$mapping"
217-
} else {
218-
return@replace mapping
219-
}
215+
return@replace mapping
220216
} else {
221217
missedMappings.add(res.groupValues[0])
222218
return@replace res.groupValues[0]

0 commit comments

Comments
 (0)