Skip to content

Commit 228fbb1

Browse files
committed
Improve MavenResolver config io
1 parent d1e5e66 commit 228fbb1

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/EsuBootstrapBukkit.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class EsuBootstrapBukkit: JavaPlugin(), EsuBootstrap {
6666
listOf(
6767
"net.neoforged:AutoRenamingTool:2.0.13",
6868
),
69-
extraRepo = if (MavenResolver.loadRepoConfiguration().id == "aliyun") listOf() else listOf(MavenResolver.MavenRepos.NEO_FORGED)
69+
extraRepo = if (MavenResolver.usingAliyun) listOf() else listOf(MavenResolver.MavenRepos.NEO_FORGED)
7070
)
7171
if (ServerCompatibility.hasMojmap)
7272
MappingsLoader

core/src/main/kotlin/io/github/rothes/esu/core/util/artifact/MavenResolver.kt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,17 @@ object MavenResolver {
6969
}
7070
setReadOnly()
7171
}
72-
private val repositories: List<RemoteRepository> =
73-
repository.newResolutionRepositories(session, createRepositories())
72+
private val repositories: List<RemoteRepository>
73+
val usingAliyun: Boolean
7474

75-
private var injecter: URLInjector = UnsafeURLInjector
75+
private var injector: URLInjector = UnsafeURLInjector
7676

77-
private fun createRepositories(): List<RemoteRepository> {
77+
78+
init {
7879
val repo = loadRepoConfiguration()
79-
return mutableListOf<RemoteRepository>().apply { // no-stdlib support
80-
add(RemoteRepository.Builder(repo.id, "default", repo.url).build())
81-
}
80+
repositories = repository.newResolutionRepositories(session, listOfJvm(RemoteRepository.Builder(repo.id, "default", repo.url).build()))
81+
@Suppress("ReplaceCallWithBinaryOperator") // no-stdlib support
82+
usingAliyun = repo.id.equals("aliyun")
8283
}
8384

8485
fun loadKotlin() {
@@ -87,11 +88,11 @@ object MavenResolver {
8788

8889
fun loadUrl(url: URL) {
8990
try {
90-
injecter.addURL(url)
91+
injector.addURL(url)
9192
} catch (e: InaccessibleObjectException) {
92-
if (injecter == UnsafeURLInjector) {
93-
injecter = ReflectURLInjector
94-
injecter.addURL(url)
93+
if (injector == UnsafeURLInjector) {
94+
injector = ReflectURLInjector
95+
injector.addURL(url)
9596
} else {
9697
throw e
9798
}

0 commit comments

Comments
 (0)