Fix name duplication checking not occurring on root classes

4 files changed, 29 insertions, 3 deletions

diff --git a/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java b/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
index a20c5028..dffcb0c6 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
@@ -39,13 +39,17 @@ public class MappingValidator {
                         Entry<?> relatedEntry = entry.replaceAncestor(containingClass, relatedClass);
                         Entry<?> translatedEntry = deobfuscator.translate(relatedEntry);
 
-                        Collection<Entry<?>> translatedSiblings = obfToDeobf.getChildren(relatedClass).stream()
-                                        .filter(e -> !entry.equals(e))
+                        Collection<Entry<?>> translatedSiblings = obfToDeobf.getSiblings(relatedEntry).stream()
                                         .map(deobfuscator::translate)
                                         .collect(Collectors.toList());
 
                         if (!isUnique(translatedEntry, translatedSiblings, name)) {
-                                throw new IllegalNameException(name, "Name is not unique in " + translatedEntry.getParent() + "!");
+                                Entry<?> parent = translatedEntry.getParent();
+                                if (parent != null) {
+                                        throw new IllegalNameException(name, "Name is not unique in " + parent + "!");
+                                } else {
+                                        throw new IllegalNameException(name, "Name is not unique!");
+                                }
                         }
                 }
         }
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java b/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java
index d8b1f50f..255fa5fb 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java
@@ -55,6 +55,11 @@ public class DeltaTrackingTree<T> implements EntryTree<T> {
                 return delegate.getChildren(entry);
         }
 
+        @Override
+        public Collection<Entry<?>> getSiblings(Entry<?> entry) {
+                return delegate.getSiblings(entry);
+        }
+
         @Nullable
         @Override
         public EntryTreeNode<T> findNode(Entry<?> entry) {
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java b/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java
index f919a393..daaefcc1 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java
@@ -14,6 +14,8 @@ import java.util.stream.Stream;
 public interface EntryTree<T> extends EntryMap<T>, Iterable<EntryTreeNode<T>>, Translatable {
         Collection<Entry<?>> getChildren(Entry<?> entry);
 
+        Collection<Entry<?>> getSiblings(Entry<?> entry);
+
         @Nullable
         EntryTreeNode<T> findNode(Entry<?> entry);
 
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java b/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
index 02f2c04a..570941cd 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
@@ -73,6 +73,21 @@ public class HashEntryTree<T> implements EntryTree<T> {
         }
 
         @Override
+        public Collection<Entry<?>> getSiblings(Entry<?> entry) {
+                Entry<?> parent = entry.getParent();
+                if (parent == null) {
+                        return getSiblings(entry, root.keySet());
+                }
+                return getSiblings(entry, getChildren(parent));
+        }
+
+        private Collection<Entry<?>> getSiblings(Entry<?> entry, Collection<Entry<?>> generation) {
+                Set<Entry<?>> siblings = new HashSet<>(generation);
+                siblings.remove(entry);
+                return siblings;
+        }
+
+        @Override
         @Nullable
         public HashTreeNode<T> findNode(Entry<?> target) {
                 List<Entry<?>> parentChain = target.getAncestry();