Fixed the wrong filter of class and object. Objects now can be loaded.

Close #21
Kotori316 · Aug 5, 2022 · 258871c · 258871c
1 parent 51e9dd8
commit 258871c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/src/main/java/com/kotori316/scala_lib/ModClassData.java b/src/main/java/com/kotori316/scala_lib/ModClassData.java
@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 import java.util.List;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public interface ModClassData {
@@ -20,9 +19,10 @@ static <T extends ModClassData> List<T> findInstance(Collection<T> targets) {
             if (ts.size() == 1) {
                 return ts.get(0);
             } else {
-                var classData = ts.stream().filter(Predicate.not(ModClassData::isScalaObj)).toList();
-                if (classData.size() == 1) {
-                    return classData.get(0);
+                var objectData = ts.stream().filter(ModClassData::isScalaObj).toList();
+                if (objectData.size() == 1) {
+                    // Ignore anything but a Scala Object.
+                    return objectData.get(0);
                 } else {
                     throw new RuntimeException("Exception in loading mods. %s".formatted(targets));
                 }

diff --git a/src/main/java/com/kotori316/scala_lib/ScalaLanguageProvider.java b/src/main/java/com/kotori316/scala_lib/ScalaLanguageProvider.java
@@ -25,14 +25,15 @@ public String name() {
     @Override
     public Consumer<ModFileScanData> getFileVisitor() {
         return scanData -> {
-            var targets = scanData.getAnnotations().stream()
+            var annotatedClasses = scanData.getAnnotations().stream()
                 .filter(t -> t.annotationType().equals(MODANNOTATION))
                 .map(data -> {
                     var className = data.clazz().getClassName();
                     var id = (String) data.annotationData().get("value");
                     return new ScalaLanguageTarget(className, id);
                 }).toList();
-            var map = ModClassData.findInstance(targets).stream()
+            var targets = ModClassData.findInstance(annotatedClasses);
+            var map = targets.stream()
                 .peek(a -> LOGGER.debug(SCAN, "Found @Mod class {} with id {}", a.className(), a.modID()))
                 .collect(Collectors.toMap(ModClassData::modID, Function.identity()));
             scanData.addLanguageLoader(map);

diff --git a/src/test/java/com/kotori316/scala_lib/ModClassDataTest.java b/src/test/java/com/kotori316/scala_lib/ModClassDataTest.java
@@ -47,14 +47,43 @@ void twoModId() {
             assertEquals(targets, result);
         }
 
+        @Test
+        void threeModIdWithObject() {
+            var targets = Set.of(
+                new ModClassDataImpl("com.kotori316.test.Mod1$", "test1"),
+                new ModClassDataImpl("com.kotori316.test.Mod1", "test1"),
+                new ModClassDataImpl("com.kotori316.test.Mod2", "test2"),
+                new ModClassDataImpl("com.kotori316.test.Mod3$", "test3"),
+                new ModClassDataImpl("com.kotori316.test.Mod3", "test3"),
+                new ModClassDataImpl("com.kotori316.test.Mod3_1", "test3")
+            );
+            var result = Set.copyOf(assertDoesNotThrow(() -> ModClassData.findInstance(targets)));
+            assertEquals(Set.of(
+                new ModClassDataImpl("com.kotori316.test.Mod1$", "test1"),
+                new ModClassDataImpl("com.kotori316.test.Mod2", "test2"),
+                new ModClassDataImpl("com.kotori316.test.Mod3$", "test3")
+            ), result);
+        }
+
         @Test
         void classAndObj() {
             var targets = Set.of(
                 new ModClassDataImpl("com.kotori316.test.Mod1$", "test1"),
                 new ModClassDataImpl("com.kotori316.test.Mod1", "test1")
             );
             var result = Set.copyOf(assertDoesNotThrow(() -> ModClassData.findInstance(targets)));
-            assertEquals(Set.of(new ModClassDataImpl("com.kotori316.test.Mod1", "test1")), result);
+            assertEquals(Set.of(new ModClassDataImpl("com.kotori316.test.Mod1$", "test1")), result);
+        }
+
+        @Test
+        void classAndObj2() {
+            var targets = Set.of(
+                new ModClassDataImpl("com.kotori316.test.Mod1$", "test1"),
+                new ModClassDataImpl("com.kotori316.test.Mod1", "test1"),
+                new ModClassDataImpl("com.kotori316.test.Mod1_other", "test1")
+            );
+            var result = Set.copyOf(assertDoesNotThrow(() -> ModClassData.findInstance(targets)));
+            assertEquals(Set.of(new ModClassDataImpl("com.kotori316.test.Mod1$", "test1")), result);
         }
 
         @Test