Skip to content

Commit 34a630b

Browse files
committed
Remap SRG names in string constants
This allows more mods to work
1 parent 0c90eb9 commit 34a630b

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/main/java/org/taumc/fmldeobfuscator/FMLRemapper.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@ public String mapMethodName(String owner, String name, String descriptor) {
2525
return proposedMethodName;
2626
}
2727

28+
@Override
29+
public Object mapValue(Object value) {
30+
if (value instanceof String string) {
31+
// Try to remap SRG constants
32+
if (string.startsWith("f_")) {
33+
return REMAPPER.apply(INameMappingService.Domain.FIELD, string);
34+
} else if (string.startsWith("m_")) {
35+
return REMAPPER.apply(INameMappingService.Domain.METHOD, string);
36+
}
37+
}
38+
return super.mapValue(value);
39+
}
40+
2841
@Override
2942
public String map(String internalName) {
3043
return REMAPPER.apply(INameMappingService.Domain.CLASS, internalName);

src/main/java/org/taumc/fmldeobfuscator/RuntimeDeobfLocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.stream.Stream;
2929

3030
public class RuntimeDeobfLocator extends AbstractJarFileModLocator {
31-
private static final int DISK_VERSION = 1;
31+
private static final int DISK_VERSION = 2;
3232
private final Path modsToDeobfFolder = FMLPaths.GAMEDIR.get().resolve("mods");
3333
private final Path cachedDeobfFolder = FMLPaths.GAMEDIR.get().resolve(".taufuscator_v" + DISK_VERSION);
3434
public static final Logger LOGGER = LogManager.getLogger("Taufuscator");

0 commit comments

Comments
 (0)