bug-fix(tsrg): don't output redundent class lines for anonymous classes

Resolves #22, though it still requires a deeper dive.
CadixDev · May 17, 2019 · d74e593 · d74e593
1 parent c097a23
commit d74e593
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lorenz/src/main/java/org/cadixdev/lorenz/impl/model/AbstractClassMappingImpl.java b/lorenz/src/main/java/org/cadixdev/lorenz/impl/model/AbstractClassMappingImpl.java
@@ -93,7 +93,7 @@ public Optional<FieldMapping> getFieldMapping(final String obfuscatedName) {
     }
 
     @Override
-    public Optional<FieldMapping> computeFieldMapping(FieldSignature signature) {
+    public Optional<FieldMapping> computeFieldMapping(final FieldSignature signature) {
         // If the field type is not provided, lookup up only the field name
         if (!signature.getType().isPresent()) {
             return this.getFieldMapping(signature.getName());

diff --git a/lorenz/src/main/java/org/cadixdev/lorenz/io/srg/tsrg/TSrgWriter.java b/lorenz/src/main/java/org/cadixdev/lorenz/io/srg/tsrg/TSrgWriter.java
@@ -69,7 +69,7 @@ public void write(final MappingSet mappings) {
     protected void writeClassMapping(final ClassMapping<?, ?> mapping) {
         // Effectively ClassMapping#hasMappings() without the inner class check
         if (mapping.hasDeobfuscatedName() ||
-                mapping.getFieldMappings().stream().anyMatch(Mapping::hasDeobfuscatedName) ||
+                mapping.getFieldsByName().values().stream().anyMatch(Mapping::hasDeobfuscatedName) ||
                 mapping.getMethodMappings().stream().anyMatch(MethodMapping::hasMappings)) {
             this.writer.println(String.format("%s %s", mapping.getFullObfuscatedName(), mapping.getFullDeobfuscatedName()));
         }