Skip to content

Commit 9dcce0d

Browse files
Escape mapped names before applying them. (#721)
1 parent 3bb06c7 commit 9dcce0d

File tree

1 file changed

+4
-2
lines changed
  • src/common/java/net/minecraftforge/gradle/common/util

1 file changed

+4
-2
lines changed

src/common/java/net/minecraftforge/gradle/common/util/McpNames.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,10 @@ private String getMapped(String srg) {
197197
private String replaceInLine(String line) {
198198
StringBuffer buf = new StringBuffer();
199199
Matcher matcher = SRG_FINDER.matcher(line);
200-
while (matcher.find())
201-
matcher.appendReplacement(buf, getMapped(matcher.group()));
200+
while (matcher.find()) {
201+
// Since '$' is a valid character in identifiers, but we need to NOT treat this as a regex group, escape any occurrences
202+
matcher.appendReplacement(buf, Matcher.quoteReplacement(getMapped(matcher.group())));
203+
}
202204
matcher.appendTail(buf);
203205
return buf.toString();
204206
}

0 commit comments

Comments
 (0)