From 39f2f2e73dfec20faef67f957e92452617ceda11 Mon Sep 17 00:00:00 2001
From: asie
Date: Sat, 27 Oct 2018 00:51:21 +0200
Subject: update gson, fix argument indexing, delete empty class mappings

---
 src/main/java/cuchaz/enigma/mapping/ClassMapping.java | 19 ++++++++++++++++++-
 .../cuchaz/enigma/mapping/MappingsEnigmaWriter.java   | 11 +++++++++--
 .../cuchaz/enigma/mapping/MappingsTinyReader.java     |  4 ++--
 3 files changed, 29 insertions(+), 5 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/mapping')

diff --git a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
index 369ba8c..9c193ef 100644
--- a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
@@ -577,7 +577,7 @@ public class ClassMapping implements Comparable<ClassMapping> {
 	}
 
 	// Used for tiny parsing to keep track of deobfuscate inner classes
-	public ClassMapping setDeobInner(String deobName) {
+	public ClassMapping setDeobfInner(String deobName) {
 		this.deobfFullName = deobName;
 		return this;
 	}
@@ -607,4 +607,21 @@ public class ClassMapping implements Comparable<ClassMapping> {
 	public boolean equals(Object obj) {
 		return obj instanceof ClassMapping && ((ClassMapping) obj).obfFullName.equals(this.obfFullName);
 	}
+
+    public boolean isEmpty() {
+		if (fieldsByDeobf.isEmpty() && methodsByDeobf.isEmpty() && deobfFullName == null && deobfName == null
+				&& innerClassesByObfSimple.values().stream().allMatch(ClassMapping::isEmpty)) {
+
+			// check args
+			for (MethodMapping mapping : methodsByObf.values()) {
+				if (mapping.arguments().iterator().hasNext()) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		return false;
+    }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
index b29990f..e3302b1 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
@@ -33,10 +33,19 @@ public class MappingsEnigmaWriter {
 
 		Mappings previousState = mappings.getPreviousState();
 		for (ClassMapping classMapping : sorted(mappings.classes())) {
+			File result = new File(target, classMapping.getSaveName() + ".mapping");
+
 			if (!classMapping.isDirty()) {
 				continue;
 			}
 
+			if (classMapping.isEmpty()) {
+				if (result.exists()) {
+					result.delete();
+				}
+				continue;
+			}
+
 			if (previousState != null) {
 				ClassMapping previousClass = previousState.classesByObf.get(classMapping.getObfFullName());
 				File previousFile;
@@ -50,8 +59,6 @@ public class MappingsEnigmaWriter {
 				}
 			}
 
-			File result = new File(target, classMapping.getSaveName() + ".mapping");
-
 			File packageFile = result.getParentFile();
 			if (!packageFile.exists()) {
 				packageFile.mkdirs();
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
index 69d5684..756ac43 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
@@ -17,7 +17,7 @@ public class MappingsTinyReader {
 	public ClassMapping readClass(String[] parts) {
 		// Extract the inner naming of the deob form if it have one
 		String deobName = parts[2].contains("$") ? parts[2].substring(parts[2].lastIndexOf('$') + 1) : parts[2];
-		return new ClassMapping(parts[1], deobName).setDeobInner(parts[2]);
+		return new ClassMapping(parts[1], deobName).setDeobfInner(parts[2]);
 	}
 
 	public FieldMapping readField(String[] parts) {
@@ -52,7 +52,7 @@ public class MappingsTinyReader {
 							                  parts[2];
 
 							// Add full deob name to the class mapping to handle inner class after this loop
-							classMappingMap.put(parts[2], classMapping.setDeobInner(parts[2]));
+							classMappingMap.put(parts[2], classMapping.setDeobfInner(parts[2]));
 							classMapping.setDeobfName(deobName);
 
 							// Avoid to make the mapping dirty directly at the startup
-- 
cgit v1.2.3