diff --git a/LaunchServer/resources/launchserver/defaults/config.cfg b/LaunchServer/resources/launchserver/defaults/config.cfg index 0fd2312..604b80b 100644 --- a/LaunchServer/resources/launchserver/defaults/config.cfg +++ b/LaunchServer/resources/launchserver/defaults/config.cfg @@ -1,36 +1,40 @@ -address: "x"; -bindAddress: "0.0.0.0"; -port: 7240; +address: "x"; # ip или домен вашего LaunchServer +bindAddress: "0.0.0.0"; # На какой интерфейс идет обращение (Лучше оставить как есть) +port: 7240; # Порт для LaunchServer -# Auth rate limit +# Ссылка на зеркало +mirror: "https://launcher-sashok724.keeperjerry.ru/download/"; + +# Лимит на авторизацию / защита от брутфорса authRateLimit: 2; authRateLimitMilis: 5000; authRejectString: "Вы превысили лимит авторизаций, подождите некоторое время!"; -# Auth handler +# Управление системой хранения и обработки UUID пользователей authHandler: "textFile"; authHandlerConfig: { file: "authHandler.cfg"; offlineUUIDs: true; }; -# Auth provider +# Управление системой авторизации пользователей authProvider: "reject"; authProviderConfig: { - message: "You need to change auth provider in LaunchServer.cfg"; + message: "Вам нужно сменить тип authProvider в LaunchServer.cfg"; }; -# Texture provider +# Управление системой скинов textureProvider: "mojang"; textureProviderConfig: { - # No config needed for mojang texture provider + # Конфигурация не требуется для текстур Mojang }; -# Binaries name +# Название файла вашего лаунчера binaryName: "Launcher"; -# Launch4J EXE binary building +# Собрать EXE файл (с помощью Launch4J) launch4J: false; -# Compress files when updating using Inflate algorithm +# Сжатие файлов при обновлении используя метод Inflate +# Лучше оставить как есть compress: true; diff --git a/LaunchServer/source/LaunchServer.java b/LaunchServer/source/LaunchServer.java index 9b5f20f..a643b44 100644 --- a/LaunchServer/source/LaunchServer.java +++ b/LaunchServer/source/LaunchServer.java @@ -467,6 +467,9 @@ @LauncherAPI public final int authRateLimitMilis; @LauncherAPI public final String authRejectString; + // Mirror + @LauncherAPI public final String mirror; + // BinaryName @LauncherAPI public final String binaryName; @@ -500,6 +503,9 @@ textureProvider = TextureProvider.newProvider(block.getEntryValue("textureProvider", StringConfigEntry.class), block.getEntry("textureProviderConfig", BlockConfigEntry.class)); + // Mirror + mirror = block.getEntryValue("mirror", StringConfigEntry.class); + // Set misc config launch4J = block.getEntryValue("launch4J", BooleanConfigEntry.class); binaryName = block.getEntryValue("binaryName", StringConfigEntry.class); diff --git a/LaunchServer/source/command/hash/DownloadAssetCommand.java b/LaunchServer/source/command/hash/DownloadAssetCommand.java index fd7ed73..1b3abe4 100644 --- a/LaunchServer/source/command/hash/DownloadAssetCommand.java +++ b/LaunchServer/source/command/hash/DownloadAssetCommand.java @@ -15,7 +15,7 @@ import launchserver.command.Command; public final class DownloadAssetCommand extends Command { - private static final String ASSET_URL_MASK = "https://launcher-sashok724.keeperjerry.ru/download/assets/%s.zip"; + private static String ASSET_URL_MASK; public DownloadAssetCommand(LaunchServer server) { super(server); @@ -43,6 +43,7 @@ Files.createDirectory(assetDir); // Download required asset + ASSET_URL_MASK = server.config.mirror + "assets/%s.zip"; LogHelper.subInfo("Downloading asset, it may take some time"); unpack(new URL(String.format(ASSET_URL_MASK, IOHelper.urlEncode(version.name))), assetDir); diff --git a/LaunchServer/source/command/hash/DownloadClientCommand.java b/LaunchServer/source/command/hash/DownloadClientCommand.java index 50c2d68..05bb030 100644 --- a/LaunchServer/source/command/hash/DownloadClientCommand.java +++ b/LaunchServer/source/command/hash/DownloadClientCommand.java @@ -20,7 +20,7 @@ import launchserver.command.CommandException; public final class DownloadClientCommand extends Command { - private static final String CLIENT_URL_MASK = "https://launcher-sashok724.keeperjerry.ru/download/clients/%s.zip"; + private static String CLIENT_URL_MASK; public DownloadClientCommand(LaunchServer server) { super(server); @@ -49,6 +49,7 @@ // Download required client LogHelper.subInfo("Downloading client, it may take some time"); + CLIENT_URL_MASK = server.config.mirror + "clients/%s.zip"; DownloadAssetCommand.unpack(new URL(String.format(CLIENT_URL_MASK, IOHelper.urlEncode(version.name))), clientDir); diff --git a/Launcher/source/Launcher.java b/Launcher/source/Launcher.java index 6d02cef..0c85275 100644 --- a/Launcher/source/Launcher.java +++ b/Launcher/source/Launcher.java @@ -77,7 +77,7 @@ private static final AtomicReference CONFIG = new AtomicReference<>(); // Version info - @LauncherAPI public static final String VERSION = "1.4.1"; + @LauncherAPI public static final String VERSION = "1.4.2"; @LauncherAPI public static final String BUILD = readBuildNumber(); @LauncherAPI public static final int PROTOCOL_MAGIC = 0x724724_00 + 23; diff --git a/buildnumber b/buildnumber index ef512cf..230fe54 100644 --- a/buildnumber +++ b/buildnumber @@ -1 +1 @@ -1.4.1, 25.06.2020 \ No newline at end of file +1.4.2, 25.06.2020 \ No newline at end of file