From b5338883d271779c335842c07047d60136316167 Mon Sep 17 00:00:00 2001 From: jeff Date: Wed, 3 Sep 2014 00:20:36 -0400 Subject: big refactor to better model class/method mappings with no deobf name --- src/cuchaz/enigma/mapping/MappingsWriter.java | 29 +++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'src/cuchaz/enigma/mapping/MappingsWriter.java') diff --git a/src/cuchaz/enigma/mapping/MappingsWriter.java b/src/cuchaz/enigma/mapping/MappingsWriter.java index 6203571..ea6e655 100644 --- a/src/cuchaz/enigma/mapping/MappingsWriter.java +++ b/src/cuchaz/enigma/mapping/MappingsWriter.java @@ -37,7 +37,14 @@ public class MappingsWriter private void write( PrintWriter out, ClassMapping classMapping, int depth ) throws IOException { - out.format( "%sCLASS %s %s\n", getIndent( depth ), classMapping.getObfName(), classMapping.getDeobfName() ); + if( classMapping.getDeobfName() == null ) + { + out.format( "%sCLASS %s\n", getIndent( depth ), classMapping.getObfName() ); + } + else + { + out.format( "%sCLASS %s %s\n", getIndent( depth ), classMapping.getObfName(), classMapping.getDeobfName() ); + } for( ClassMapping innerClassMapping : sorted( classMapping.innerClasses() ) ) { @@ -64,11 +71,21 @@ public class MappingsWriter private void write( PrintWriter out, MethodMapping methodMapping, int depth ) throws IOException { - out.format( "%sMETHOD %s %s %s %s\n", - getIndent( depth ), - methodMapping.getObfName(), methodMapping.getDeobfName(), - methodMapping.getObfSignature(), methodMapping.getDeobfSignature() - ); + if( methodMapping.getDeobfName() == null ) + { + out.format( "%sMETHOD %s %s\n", + getIndent( depth ), + methodMapping.getObfName(), methodMapping.getObfSignature() + ); + } + else + { + out.format( "%sMETHOD %s %s %s %s\n", + getIndent( depth ), + methodMapping.getObfName(), methodMapping.getDeobfName(), + methodMapping.getObfSignature(), methodMapping.getDeobfSignature() + ); + } for( ArgumentMapping argumentMapping : sorted( methodMapping.arguments() ) ) { -- cgit v1.2.3