From 612aa72b917858cd5b4b460efb08005b92993eb9 Mon Sep 17 00:00:00 2001 From: Kotori316 Date: Sat, 11 May 2024 19:10:35 +0900 Subject: [PATCH] Fix logic miss --- gradle.properties | 2 +- .../java/com/kotori316/scala_lib/ScalaLanguageProvider.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index e08899d..f451943 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -build_number=5 +build_number=6 branch=1.20.5 mod_id=scala-library-object # the dependencies are declared in gradle/libs.versions.toml diff --git a/neoforge/src/main/java/com/kotori316/scala_lib/ScalaLanguageProvider.java b/neoforge/src/main/java/com/kotori316/scala_lib/ScalaLanguageProvider.java index f9e76d4..21a8d5b 100644 --- a/neoforge/src/main/java/com/kotori316/scala_lib/ScalaLanguageProvider.java +++ b/neoforge/src/main/java/com/kotori316/scala_lib/ScalaLanguageProvider.java @@ -76,11 +76,11 @@ public void validate(IModFile file, Collection loadedContainers, I }); mods.values().stream() // Check mod has only 1 class for each mod id - .filter(dataList -> dataList.size() != 1 || dataList.stream().filter(ModClassData::isScalaObj).count() != 1) + .filter(dataList -> dataList.size() != 1 && dataList.stream().filter(ModClassData::isScalaObj).count() != 1) .forEach(dataList -> { var modId = dataList.getFirst().modID(); var classes = dataList.stream().map(ModClassData::className).toList(); - var issue = ModLoadingIssue.error("Duplicated mod classes for %s, found: %s", modId, classes); + var issue = ModLoadingIssue.error("Duplicated mod classes for %s, found: %s".formatted(modId, classes)); reporter.addIssue(issue); }); }