Fix inner class name validation

2 files changed, 9 insertions, 2 deletions

diff --git a/enigma/src/main/java/cuchaz/enigma/translation/mapping/IdentifierValidation.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/IdentifierValidation.java
index 097c9e90..89797678 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/mapping/IdentifierValidation.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/IdentifierValidation.java
@@ -31,8 +31,15 @@ public final class IdentifierValidation {
                         "long", "strictfp", "volatile", "const", "float", "native", "super", "while", "_"
         );
 
-        public static boolean validateClassName(ValidationContext vc, String name) {
+        public static boolean validateClassName(ValidationContext vc, String name, boolean isInner) {
                 if (!StandardValidation.notBlank(vc, name)) return false;
+
+                if (isInner) {
+                        // When renaming, inner class names do not contain the package name,
+                        // but only the class name.
+                        return validateIdentifier(vc, name);
+                }
+
                 String[] parts = name.split("/");
                 for (String part : parts) {
                         validateIdentifier(vc, part);
diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
index 15b0a9b4..a167e211 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
@@ -99,7 +99,7 @@ public class ClassEntry extends ParentedEntry<ClassEntry> implements Comparable<
 
         @Override
         public void validateName(ValidationContext vc, String name) {
-                IdentifierValidation.validateClassName(vc, name);
+                IdentifierValidation.validateClassName(vc, name, this.isInnerClass());
         }
 
         @Override