diff --git a/build.gradle b/build.gradle index 9c466e3..d94e96c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { } group 'io.izzel.taboolib' -version '1.9' +version '1.10' configurations { embed diff --git a/src/main/groovy/io/izzel/taboolib/gradle/RelocateJar.groovy b/src/main/groovy/io/izzel/taboolib/gradle/RelocateJar.groovy index e809526..f8ad7c6 100644 --- a/src/main/groovy/io/izzel/taboolib/gradle/RelocateJar.groovy +++ b/src/main/groovy/io/izzel/taboolib/gradle/RelocateJar.groovy @@ -142,9 +142,19 @@ class RelocateJar extends DefaultTask { } } - static boolean isIsolated(Map> use, Set refer, Map> isolated, String nameWithOutExtension) { - if (isolated.containsKey(nameWithOutExtension)) { - return refer.size() <= 1 || refer.stream().allMatch { nameWithOutExtension == it || isolated[nameWithOutExtension].contains(it) || isIsolated(use, use[it], isolated, it) } + static boolean isIsolated( + Map> use, + Set refer, + Map> isolated, + String name, + String exclude = null + ) { + if (isolated.containsKey(name)) { + return refer.size() <= 1 || refer.stream() + .filter { it != exclude } + .allMatch { + name == it || isolated[name].contains(it) || isIsolated(use, use[it], isolated, it, name) + } } else { return false }