update gson, fix argument indexing, delete empty class mappings

1 files changed, 9 insertions, 2 deletions

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();