From 1faf3bee250f75d8c13708ab875a881a5b9cb6ed Mon Sep 17 00:00:00 2001 From: jeff Date: Wed, 3 Sep 2014 23:56:11 -0400 Subject: removed deobfuscated method signatures from mappings They're too much work to maintain, and they're totally unnecessary! --- src/cuchaz/enigma/mapping/ClassMapping.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/cuchaz/enigma/mapping/ClassMapping.java') diff --git a/src/cuchaz/enigma/mapping/ClassMapping.java b/src/cuchaz/enigma/mapping/ClassMapping.java index 6a89df7..200d9ca 100644 --- a/src/cuchaz/enigma/mapping/ClassMapping.java +++ b/src/cuchaz/enigma/mapping/ClassMapping.java @@ -214,7 +214,7 @@ public class ClassMapping implements Serializable, Comparable assert( wasAdded ); if( methodMapping.getDeobfName() != null ) { - String deobfKey = getMethodKey( methodMapping.getDeobfName(), methodMapping.getDeobfSignature() ); + String deobfKey = getMethodKey( methodMapping.getDeobfName(), methodMapping.getObfSignature() ); if( m_methodsByDeobf.containsKey( deobfKey ) ) { throw new Error( "Already have mapping for " + m_deobfName + "." + deobfKey ); @@ -248,7 +248,7 @@ public class ClassMapping implements Serializable, Comparable return name + signature; } - public void setMethodNameAndSignature( String obfName, String obfSignature, String deobfName, String deobfSignature ) + public void setMethodName( String obfName, String obfSignature, String deobfName ) { MethodMapping methodMapping = m_methodsByObf.get( getMethodKey( obfName, obfSignature ) ); if( methodMapping == null ) @@ -257,23 +257,14 @@ public class ClassMapping implements Serializable, Comparable } else if( methodMapping.getDeobfName() != null ) { - boolean wasRemoved = m_methodsByDeobf.remove( getMethodKey( methodMapping.getDeobfName(), methodMapping.getDeobfSignature() ) ) != null; + boolean wasRemoved = m_methodsByDeobf.remove( getMethodKey( methodMapping.getDeobfName(), methodMapping.getObfSignature() ) ) != null; assert( wasRemoved ); } methodMapping.setDeobfName( deobfName ); - methodMapping.setDeobfSignature( deobfSignature ); - boolean wasAdded = m_methodsByDeobf.put( getMethodKey( deobfName, deobfSignature ), methodMapping ) == null; + boolean wasAdded = m_methodsByDeobf.put( getMethodKey( deobfName, obfSignature ), methodMapping ) == null; assert( wasAdded ); } - public void updateDeobfMethodSignatures( Translator translator ) - { - for( MethodMapping methodIndex : m_methodsByObf.values() ) - { - methodIndex.setDeobfSignature( translator.translateSignature( methodIndex.getObfSignature() ) ); - } - } - //// ARGUMENTS //////// public void setArgumentName( String obfMethodName, String obfMethodSignature, int argumentIndex, String argumentName ) -- cgit v1.2.3