From 0bc78d57a860789efa2c5af1fd2600f09332e78e Mon Sep 17 00:00:00 2001 From: Thog Date: Sun, 14 Aug 2016 15:58:58 +0200 Subject: Add F5 hotkey to reload class + use a ugly hack to avoid rename issues with generics... --- src/main/java/cuchaz/enigma/Deobfuscator.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/main/java/cuchaz/enigma/Deobfuscator.java') diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java index 8cd80be..32792c6 100644 --- a/src/main/java/cuchaz/enigma/Deobfuscator.java +++ b/src/main/java/cuchaz/enigma/Deobfuscator.java @@ -375,6 +375,10 @@ public class Deobfuscator { } public boolean isObfuscatedIdentifier(Entry obfEntry) { + return isObfuscatedIdentifier(obfEntry, false); + } + + public boolean isObfuscatedIdentifier(Entry obfEntry, boolean hack) { if (obfEntry instanceof MethodEntry) { @@ -405,13 +409,21 @@ public class Deobfuscator { } else if (name.equals("wait") && sig.equals("(JI)V")) { return false; } + + // FIXME: HACK EVEN MORE HACK! + if (hack) + return true; } return this.jarIndex.containsObfEntry(obfEntry); } + public boolean isRenameable(EntryReference obfReference, boolean activeHack) { + return obfReference.isNamed() && isObfuscatedIdentifier(obfReference.getNameableEntry(), activeHack); + } + public boolean isRenameable(EntryReference obfReference) { - return obfReference.isNamed() && isObfuscatedIdentifier(obfReference.getNameableEntry()); + return isRenameable(obfReference, false); } // NOTE: these methods are a bit messy... oh well -- cgit v1.2.3