From 6e464ea251cab63c776ece0b2a356f1498ffa294 Mon Sep 17 00:00:00 2001 From: Thog Date: Wed, 8 Mar 2017 08:17:04 +0100 Subject: Follow Fabric guidelines --- .../enigma/mapping/MappingsEnigmaWriter.java | 70 +++++++++++----------- 1 file changed, 34 insertions(+), 36 deletions(-) (limited to 'src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java') diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java index 6c57200..ba1b258 100644 --- a/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java +++ b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java @@ -4,10 +4,11 @@ * are made available under the terms of the GNU Lesser General Public * License v3.0 which accompanies this distribution, and is available at * http://www.gnu.org/licenses/lgpl.html - * + * * Contributors: * Jeff Martin - initial API and implementation ******************************************************************************/ + package cuchaz.enigma.mapping; import com.google.common.base.Charsets; @@ -18,15 +19,13 @@ import java.util.Collections; import java.util.List; public class MappingsEnigmaWriter { - + public void write(File out, Mappings mappings, boolean isDirectoryFormat) throws IOException { - if (!isDirectoryFormat) - { + if (!isDirectoryFormat) { PrintWriter outputWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(out), Charsets.UTF_8)); write(outputWriter, mappings); outputWriter.close(); - } - else + } else writeAsDirectory(out, mappings); } @@ -42,8 +41,7 @@ public class MappingsEnigmaWriter { File result; if (classMapping.getDeobfName() == null) result = obFile; - else - { + else { // Make sure that old version of the file doesn't exist if (obFile.exists()) obFile.delete(); @@ -59,19 +57,16 @@ public class MappingsEnigmaWriter { } // Remove dropped mappings - if (mappings.getPreviousState() != null) - { + if (mappings.getPreviousState() != null) { List droppedClassMappings = new ArrayList<>(mappings.getPreviousState().classes()); List classMappings = new ArrayList<>(mappings.classes()); droppedClassMappings.removeAll(classMappings); - for (ClassMapping classMapping : droppedClassMappings) - { + for (ClassMapping classMapping : droppedClassMappings) { File obFile = new File(target, classMapping.getObfFullName() + ".mapping"); File result; if (classMapping.getDeobfName() == null) result = obFile; - else - { + else { // Make sure that old version of the file doesn't exist if (obFile.exists()) obFile.delete(); @@ -86,18 +81,15 @@ public class MappingsEnigmaWriter { private void deletePreviousClassMapping(File target, ClassMapping classMapping) { File prevFile = null; // Deob rename - if (classMapping.getDeobfName() != null && classMapping.getPreviousDeobfName() != null && !classMapping.getPreviousDeobfName().equals(classMapping.getDeobfName())) - { + if (classMapping.getDeobfName() != null && classMapping.getPreviousDeobfName() != null && !classMapping.getPreviousDeobfName().equals(classMapping.getDeobfName())) { prevFile = new File(target, classMapping.getPreviousDeobfName() + ".mapping"); } // Deob to ob rename - else if (classMapping.getDeobfName() == null && classMapping.getPreviousDeobfName() != null) - { + else if (classMapping.getDeobfName() == null && classMapping.getPreviousDeobfName() != null) { prevFile = new File(target, classMapping.getPreviousDeobfName() + ".mapping"); } // Ob to Deob rename - else if (classMapping.getDeobfName() != null && classMapping.getPreviousDeobfName() == null) - { + else if (classMapping.getDeobfName() != null && classMapping.getPreviousDeobfName() == null) { prevFile = new File(target, classMapping.getObfFullName() + ".mapping"); } @@ -110,50 +102,56 @@ public class MappingsEnigmaWriter { write(out, classMapping, 0); } } - + private void write(PrintWriter out, ClassMapping classMapping, int depth) throws IOException { if (classMapping.getDeobfName() == null) { - out.format("%sCLASS %s%s\n", getIndent(depth), classMapping.getObfFullName(), classMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : classMapping.getModifier().getFormattedName()); + out.format("%sCLASS %s%s\n", getIndent(depth), classMapping.getObfFullName(), + classMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : classMapping.getModifier().getFormattedName()); } else { - out.format("%sCLASS %s %s%s\n", getIndent(depth), classMapping.getObfFullName(), classMapping.getDeobfName(), classMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : classMapping.getModifier().getFormattedName()); + out.format("%sCLASS %s %s%s\n", getIndent(depth), classMapping.getObfFullName(), classMapping.getDeobfName(), + classMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : classMapping.getModifier().getFormattedName()); } - + for (ClassMapping innerClassMapping : sorted(classMapping.innerClasses())) { write(out, innerClassMapping, depth + 1); } - + for (FieldMapping fieldMapping : sorted(classMapping.fields())) { write(out, fieldMapping, depth + 1); } - + for (MethodMapping methodMapping : sorted(classMapping.methods())) { write(out, methodMapping, depth + 1); } } - + private void write(PrintWriter out, FieldMapping fieldMapping, int depth) { if (fieldMapping.getDeobfName() == null) - out.format("%sFIELD %s %s%s\n", getIndent(depth), fieldMapping.getObfName(), fieldMapping.getObfType().toString(), fieldMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : fieldMapping.getModifier().getFormattedName()); + out.format("%sFIELD %s %s%s\n", getIndent(depth), fieldMapping.getObfName(), fieldMapping.getObfType().toString(), + fieldMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : fieldMapping.getModifier().getFormattedName()); else - out.format("%sFIELD %s %s %s%s\n", getIndent(depth), fieldMapping.getObfName(), fieldMapping.getDeobfName(), fieldMapping.getObfType().toString(), fieldMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : fieldMapping.getModifier().getFormattedName()); + out.format("%sFIELD %s %s %s%s\n", getIndent(depth), fieldMapping.getObfName(), fieldMapping.getDeobfName(), fieldMapping.getObfType().toString(), + fieldMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : fieldMapping.getModifier().getFormattedName()); } - + private void write(PrintWriter out, MethodMapping methodMapping, int depth) throws IOException { if (methodMapping.getDeobfName() == null) { - out.format("%sMETHOD %s %s%s\n", getIndent(depth), methodMapping.getObfName(), methodMapping.getObfSignature(), methodMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" :methodMapping.getModifier().getFormattedName()); + out.format("%sMETHOD %s %s%s\n", getIndent(depth), methodMapping.getObfName(), methodMapping.getObfSignature(), + methodMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : methodMapping.getModifier().getFormattedName()); } else { - out.format("%sMETHOD %s %s %s%s\n", getIndent(depth), methodMapping.getObfName(), methodMapping.getDeobfName(), methodMapping.getObfSignature(), methodMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : methodMapping.getModifier().getFormattedName()); + out.format("%sMETHOD %s %s %s%s\n", getIndent(depth), methodMapping.getObfName(), methodMapping.getDeobfName(), methodMapping.getObfSignature(), + methodMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : methodMapping.getModifier().getFormattedName()); } - + for (ArgumentMapping argumentMapping : sorted(methodMapping.arguments())) { write(out, argumentMapping, depth + 1); } } - + private void write(PrintWriter out, ArgumentMapping argumentMapping, int depth) { out.format("%sARG %d %s\n", getIndent(depth), argumentMapping.getIndex(), argumentMapping.getName()); } - + private > List sorted(Iterable classes) { List out = new ArrayList<>(); for (T t : classes) { @@ -162,7 +160,7 @@ public class MappingsEnigmaWriter { Collections.sort(out); return out; } - + private String getIndent(int depth) { StringBuilder buf = new StringBuilder(); for (int i = 0; i < depth; i++) { -- cgit v1.2.3