From 6e464ea251cab63c776ece0b2a356f1498ffa294 Mon Sep 17 00:00:00 2001
From: Thog
Date: Wed, 8 Mar 2017 08:17:04 +0100
Subject: Follow Fabric guidelines

---
 .../java/cuchaz/enigma/mapping/FieldMapping.java   | 180 ++++++++++-----------
 1 file changed, 88 insertions(+), 92 deletions(-)

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

diff --git a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
index 22ba307..cd761b4 100644
--- a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
@@ -8,103 +8,99 @@
  * Contributors:
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.mapping;
 
 import cuchaz.enigma.throwables.IllegalNameException;
 
 public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<FieldEntry> {
 
-    private String obfName;
-    private String deobfName;
-    private Type obfType;
-    private Mappings.EntryModifier modifier;
-
-    public FieldMapping(String obfName, Type obfType, String deobfName, Mappings.EntryModifier modifier) {
-        this.obfName = obfName;
-        this.deobfName = NameValidator.validateFieldName(deobfName);
-        this.obfType = obfType;
-        this.modifier = modifier;
-    }
-
-    public FieldMapping(FieldMapping other, ClassNameReplacer obfClassNameReplacer) {
-        this.obfName = other.obfName;
-        this.deobfName = other.deobfName;
-        this.modifier = other.modifier;
-        this.obfType = new Type(other.obfType, obfClassNameReplacer);
-    }
-
-    @Override
-    public FieldEntry getObfEntry(ClassEntry classEntry) {
-        return new FieldEntry(classEntry, this.obfName, this.obfType);
-    }
-
-    @Override
-    public String getObfName() {
-        return this.obfName;
-    }
-
-    public String getDeobfName() {
-        return this.deobfName;
-    }
-
-    public void setDeobfName(String val) {
-        this.deobfName = NameValidator.validateFieldName(val);
-    }
-
-    public void setObfName(String name) {
-        try
-        {
-            NameValidator.validateMethodName(name);
-        } catch (IllegalNameException ex)
-        {
-            // Invalid name, damn obfuscation! Map to a deob name with another name to avoid issues
-            if (this.deobfName == null)
-            {
-                System.err.println("WARNING: " + name + " is conflicting, auto deobfuscate to " + (name + "_auto_deob"));
-                setDeobfName(name + "_auto_deob");
-            }
-        }
-        this.obfName = name;
-    }
-
-    public Type getObfType() {
-        return this.obfType;
-    }
-
-    public void setObfType(Type val) {
-        this.obfType = val;
-    }
-
-    public void setModifier(Mappings.EntryModifier modifier)
-    {
-        this.modifier = modifier;
-    }
-
-    public Mappings.EntryModifier getModifier()
-    {
-        return modifier;
-    }
-
-    @Override
-    public int compareTo(FieldMapping other) {
-        return (this.obfName + this.obfType).compareTo(other.obfName + other.obfType);
-    }
-
-    public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) {
-        // rename obf classes in the type
-        Type newType = new Type(this.obfType, className ->
-        {
-            if (className.equals(oldObfClassName)) {
-                return newObfClassName;
-            }
-            return null;
-        });
-
-        if (!newType.equals(this.obfType)) {
-            this.obfType = newType;
-            return true;
-        }
-        return false;
-    }
+	private String obfName;
+	private String deobfName;
+	private Type obfType;
+	private Mappings.EntryModifier modifier;
+
+	public FieldMapping(String obfName, Type obfType, String deobfName, Mappings.EntryModifier modifier) {
+		this.obfName = obfName;
+		this.deobfName = NameValidator.validateFieldName(deobfName);
+		this.obfType = obfType;
+		this.modifier = modifier;
+	}
+
+	public FieldMapping(FieldMapping other, ClassNameReplacer obfClassNameReplacer) {
+		this.obfName = other.obfName;
+		this.deobfName = other.deobfName;
+		this.modifier = other.modifier;
+		this.obfType = new Type(other.obfType, obfClassNameReplacer);
+	}
+
+	@Override
+	public FieldEntry getObfEntry(ClassEntry classEntry) {
+		return new FieldEntry(classEntry, this.obfName, this.obfType);
+	}
+
+	@Override
+	public String getObfName() {
+		return this.obfName;
+	}
+
+	public void setObfName(String name) {
+		try {
+			NameValidator.validateMethodName(name);
+		} catch (IllegalNameException ex) {
+			// Invalid name, damn obfuscation! Map to a deob name with another name to avoid issues
+			if (this.deobfName == null) {
+				System.err.println("WARNING: " + name + " is conflicting, auto deobfuscate to " + (name + "_auto_deob"));
+				setDeobfName(name + "_auto_deob");
+			}
+		}
+		this.obfName = name;
+	}
+
+	public String getDeobfName() {
+		return this.deobfName;
+	}
+
+	public void setDeobfName(String val) {
+		this.deobfName = NameValidator.validateFieldName(val);
+	}
+
+	public Type getObfType() {
+		return this.obfType;
+	}
+
+	public void setObfType(Type val) {
+		this.obfType = val;
+	}
+
+	public Mappings.EntryModifier getModifier() {
+		return modifier;
+	}
+
+	public void setModifier(Mappings.EntryModifier modifier) {
+		this.modifier = modifier;
+	}
+
+	@Override
+	public int compareTo(FieldMapping other) {
+		return (this.obfName + this.obfType).compareTo(other.obfName + other.obfType);
+	}
+
+	public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) {
+		// rename obf classes in the type
+		Type newType = new Type(this.obfType, className ->
+		{
+			if (className.equals(oldObfClassName)) {
+				return newObfClassName;
+			}
+			return null;
+		});
+
+		if (!newType.equals(this.obfType)) {
+			this.obfType = newType;
+			return true;
+		}
+		return false;
+	}
 
 }
-- 
cgit v1.2.3