diff --git a/build.gradle b/build.gradle index 8d5f8ce8..dc272b41 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ allprojects { group 'io.izzel.arclight' - version '1.0.9' + version '1.0.10-SNAPSHOT' ext { agpVersion = '1.9' diff --git a/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java b/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java index 52663da8..d8cb5e38 100644 --- a/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java +++ b/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java @@ -40,21 +40,15 @@ import java.util.jar.Manifest; public class ForgeInstaller { private static final String[] MAVEN_REPO = { - "https://download.mcbbs.net/maven/", - "https://bmclapi2.bangbang93.com/maven/", - "https://maven.aliyun.com/repository/public/", - "https://repo.spongepowered.org/maven/", - "https://oss.sonatype.org/content/repositories/snapshots/", - "https://hub.spigotmc.org/nexus/content/repositories/snapshots/", - "https://files.minecraftforge.net/maven/", - "https://repo1.maven.org/maven2/" + "https://arclight.mcxk.net/" }; - private static final String INSTALLER_URL = "https://bmclapi2.bangbang93.com/maven/net/minecraftforge/forge/%s-%s/forge-%s-%s-installer.jar"; - private static final String SERVER_URL = "https://bmclapi2.bangbang93.com/version/%s/server"; + private static final String INSTALLER_URL = "https://arclight.mcxk.net/net/minecraftforge/forge/%s-%s/forge-%s-%s-installer.jar"; + private static final String SERVER_URL = "https://arclight.mcxk.net/net/minecraft/server/minecraft_server.%s.jar"; private static final Map VERSION_HASH = ImmutableMap.of( "1.14.4", "3dc3d84a581f14691199cf6831b71ed1296a9fdf", "1.15.2", "bb2b6b1aefcd70dfd1892149ac3a215f6c636b07", - "1.16.3", "f02f4473dbf152c23d7d484952121db0b36698cb" + "1.16.3", "f02f4473dbf152c23d7d484952121db0b36698cb", + "1.16.4", "35139deedbd5182953cf1caa23835da59ca3d7cd" ); public static void install() throws Throwable { @@ -63,7 +57,7 @@ public class ForgeInstaller { List> suppliers = checkMavenNoSource(installInfo.libraries); Path path = Paths.get(String.format("forge-%s-%s.jar", installInfo.installer.minecraft, installInfo.installer.forge)); if (!suppliers.isEmpty() || !Files.exists(path)) { - ArclightLocale.info("downloader.info"); + ArclightLocale.info("downloader.info2"); ExecutorService pool = Executors.newFixedThreadPool(8); CompletableFuture[] array = suppliers.stream().map(reportSupply(pool)).toArray(CompletableFuture[]::new); if (!Files.exists(path)) { @@ -181,7 +175,6 @@ public class ForgeInstaller { Manifest manifest = jarFile.getManifest(); String[] split = manifest.getMainAttributes().getValue("Class-Path").split(" "); for (String s : split) { - if (s.contains("eventbus-1.0.0-service")) continue; addToPath(Paths.get(s)); } for (String library : installInfo.libraries.keySet()) { diff --git a/i18n-config/src/main/resources/META-INF/i18n/en_us.conf b/i18n-config/src/main/resources/META-INF/i18n/en_us.conf index 18fa6f57..5ffcea84 100644 --- a/i18n-config/src/main/resources/META-INF/i18n/en_us.conf +++ b/i18n-config/src/main/resources/META-INF/i18n/en_us.conf @@ -13,9 +13,8 @@ logo = [ "" ] downloader { - info = [ + info2 = [ "Libraries are missing, downloading!" - "Downloading service by BMCLAPI https://bmclapidoc.bangbang93.com" "Support MinecraftForge project https://www.patreon.com/LexManos/" ] http-error = "HTTP Error {0} {1}" diff --git a/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf b/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf index 7e632d78..080c8dc3 100644 --- a/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf +++ b/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf @@ -13,9 +13,8 @@ logo = [ "" ] downloader { - info = [ + info2 = [ "文件不完整,正在自动下载" - "BMCLAPI 提供下载服务 https://bmclapidoc.bangbang93.com" "支持 MinecraftForge 项目 https://www.patreon.com/LexManos/" ] http-error = "HTTP 错误 {0} {1}"