diff --git a/LaunchServer/resources/launchserver/defaults/config.cfg b/LaunchServer/resources/launchserver/defaults/config.cfg index 60a3d51..0fd2312 100644 --- a/LaunchServer/resources/launchserver/defaults/config.cfg +++ b/LaunchServer/resources/launchserver/defaults/config.cfg @@ -26,6 +26,9 @@ # No config needed for mojang texture provider }; +# Binaries name +binaryName: "Launcher"; + # Launch4J EXE binary building launch4J: false; diff --git a/LaunchServer/source/LaunchServer.java b/LaunchServer/source/LaunchServer.java index 7d5f801..9b5f20f 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; + // BinaryName + @LauncherAPI public final String binaryName; + // Misc options @LauncherAPI public final boolean launch4J; @LauncherAPI public final boolean compress; @@ -499,6 +502,7 @@ // Set misc config launch4J = block.getEntryValue("launch4J", BooleanConfigEntry.class); + binaryName = block.getEntryValue("binaryName", StringConfigEntry.class); compress = block.getEntryValue("compress", BooleanConfigEntry.class); } diff --git a/LaunchServer/source/binary/EXEL4JLauncherBinary.java b/LaunchServer/source/binary/EXEL4JLauncherBinary.java index ebb7e8b..07e9333 100644 --- a/LaunchServer/source/binary/EXEL4JLauncherBinary.java +++ b/LaunchServer/source/binary/EXEL4JLauncherBinary.java @@ -26,7 +26,7 @@ @LauncherAPI public EXEL4JLauncherBinary(LaunchServer server) { - super(server, server.dir.resolve(EXELauncherBinary.EXE_BINARY_FILE)); + super(server, server.dir.resolve(server.config.binaryName + ".exe")); faviconFile = server.dir.resolve("favicon.ico"); setConfig(); } diff --git a/LaunchServer/source/binary/EXELauncherBinary.java b/LaunchServer/source/binary/EXELauncherBinary.java index 630938a..324e925 100644 --- a/LaunchServer/source/binary/EXELauncherBinary.java +++ b/LaunchServer/source/binary/EXELauncherBinary.java @@ -2,19 +2,16 @@ import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Path; -import launcher.LauncherAPI; import launcher.helper.IOHelper; import launcher.helper.LogHelper; import launchserver.LaunchServer; -public final class EXELauncherBinary extends LauncherBinary { - @LauncherAPI public static final Path EXE_BINARY_FILE = IOHelper.toPath("Launcher.exe"); - - @LauncherAPI - public EXELauncherBinary(LaunchServer server) { - super(server, server.dir.resolve(EXE_BINARY_FILE)); +public final class EXELauncherBinary extends LauncherBinary +{ + public EXELauncherBinary(LaunchServer server) + { + super(server, server.dir.resolve(server.config.binaryName + ".exe")); } @Override diff --git a/LaunchServer/source/binary/JARLauncherBinary.java b/LaunchServer/source/binary/JARLauncherBinary.java index 98870d5..3a66de6 100644 --- a/LaunchServer/source/binary/JARLauncherBinary.java +++ b/LaunchServer/source/binary/JARLauncherBinary.java @@ -34,7 +34,7 @@ @LauncherAPI public JARLauncherBinary(LaunchServer server) throws IOException { - super(server, server.dir.resolve("Launcher.jar")); + super(server, server.dir.resolve(server.config.binaryName + ".jar")); runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR); initScriptFile = runtimeDir.resolve(Launcher.INIT_SCRIPT_FILE); tryUnpackRuntime(); diff --git a/LaunchServer/source/binary/LauncherBinary.java b/LaunchServer/source/binary/LauncherBinary.java index 86c712c..f84f297 100644 --- a/LaunchServer/source/binary/LauncherBinary.java +++ b/LaunchServer/source/binary/LauncherBinary.java @@ -8,7 +8,8 @@ import launcher.serialize.signed.SignedBytesHolder; import launchserver.LaunchServer; -public abstract class LauncherBinary { +public abstract class LauncherBinary +{ @LauncherAPI protected final LaunchServer server; @LauncherAPI protected final Path binaryFile; private volatile SignedBytesHolder binary; @@ -23,17 +24,20 @@ public abstract void build() throws IOException; @LauncherAPI - public final boolean exists() { + public final boolean exists() + { return IOHelper.isFile(binaryFile); } @LauncherAPI - public final SignedBytesHolder getBytes() { + public final SignedBytesHolder getBytes() + { return binary; } @LauncherAPI - public final boolean sync() throws IOException { + public final boolean sync() throws IOException + { boolean exists = exists(); binary = exists ? new SignedBytesHolder(IOHelper.read(binaryFile), server.privateKey) : null; return exists; diff --git a/Launcher/source/Launcher.java b/Launcher/source/Launcher.java index 9f5eb25..6d02cef 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.0"; + @LauncherAPI public static final String VERSION = "1.4.1"; @LauncherAPI public static final String BUILD = readBuildNumber(); @LauncherAPI public static final int PROTOCOL_MAGIC = 0x724724_00 + 23; diff --git a/buildnumber b/buildnumber index 4bd1bbc..ef512cf 100644 --- a/buildnumber +++ b/buildnumber @@ -1 +1 @@ -1.4.0, 25.06.2020 \ No newline at end of file +1.4.1, 25.06.2020 \ No newline at end of file