diff --git a/LaunchServer/resources/launchserver/defaults/config.cfg b/LaunchServer/resources/launchserver/defaults/config.cfg index 409bcb5..da4e2cb 100644 --- a/LaunchServer/resources/launchserver/defaults/config.cfg +++ b/LaunchServer/resources/launchserver/defaults/config.cfg @@ -36,7 +36,14 @@ binaryName: "Launcher"; # Собрать EXE файл (с помощью Launch4J) -launch4J: false; +launch4J: { + enabled: false; + productName: "LauncherSchool"; + fileDesc: "LauncherSchool by KeeperJerry"; + internalName: "Launcher"; + copyright: "© KeeperJerry"; + trademarks: "This product is licensed under GNU v3.0"; +}; # Сжатие файлов при обновлении используя метод Inflate # Лучше оставить как есть diff --git a/LaunchServer/source/LaunchServer.java b/LaunchServer/source/LaunchServer.java index 7b8b47f..26eddb9 100644 --- a/LaunchServer/source/LaunchServer.java +++ b/LaunchServer/source/LaunchServer.java @@ -186,7 +186,7 @@ // Set launcher EXE binary launcherBinary = new JARLauncherBinary(this); - launcherEXEBinary = config.launch4J ? new EXEL4JLauncherBinary(this) : new EXELauncherBinary(this); + launcherEXEBinary = binary(); syncLauncherBinaries(); if (config.checkServerUpdate) @@ -373,6 +373,11 @@ rebindServerSocket(); } + private LauncherBinary binary() { + if (config.launch4J.enabled) return new EXEL4JLauncherBinary(this); + return new EXELauncherBinary(this); + } + @LauncherAPI public void buildLauncherBinaries() throws IOException { @@ -571,7 +576,7 @@ // Misc options @LauncherAPI - public final boolean launch4J; + public final ExeConf launch4J; @LauncherAPI public final boolean compress; private final StringConfigEntry address; @@ -609,11 +614,36 @@ mirror = block.getEntryValue("mirror", StringConfigEntry.class); // Set misc config - launch4J = block.getEntryValue("launch4J", BooleanConfigEntry.class); + launch4J = new ExeConf(block.getEntry("launch4J", BlockConfigEntry.class)); binaryName = block.getEntryValue("binaryName", StringConfigEntry.class); compress = block.getEntryValue("compress", BooleanConfigEntry.class); } + public static class ExeConf extends ConfigObject { + public final boolean enabled; + public String productName; + public String fileDesc; + public String internalName; + public String copyright; + public String trademarks; + + private ExeConf(BlockConfigEntry block) + { + super(block); + enabled = block.getEntryValue("enabled", BooleanConfigEntry.class); + productName = block.hasEntry("productName") ? block.getEntryValue("productName", StringConfigEntry.class) + : "LauncherSchool"; + fileDesc = block.hasEntry("fileDesc") ? block.getEntryValue("fileDesc", StringConfigEntry.class) + : "LauncherSchool by KeeperJerry"; + internalName = block.hasEntry("internalName") ? block.getEntryValue("internalName", StringConfigEntry.class) + : "Launcher"; + copyright = block.hasEntry("copyright") ? block.getEntryValue("copyright", StringConfigEntry.class) + : "© KeeperJerry"; + trademarks = block.hasEntry("trademarks") ? block.getEntryValue("trademarks", StringConfigEntry.class) + : "This product is licensed under GNU v3.0"; + } + } + @LauncherAPI public String getAddress() { diff --git a/LaunchServer/source/binary/EXEL4JLauncherBinary.java b/LaunchServer/source/binary/EXEL4JLauncherBinary.java index 529be7f..6298c0c 100644 --- a/LaunchServer/source/binary/EXEL4JLauncherBinary.java +++ b/LaunchServer/source/binary/EXEL4JLauncherBinary.java @@ -82,21 +82,21 @@ // Prepare version info (product) VersionInfo info = new VersionInfo(); - info.setProductName("KeeperJerry's Launcher"); - info.setProductVersion("1.0.0.0"); + info.setProductName(server.config.launch4J.productName); + info.setProductVersion(Launcher.VERSION); info.setTxtProductVersion(Launcher.VERSION + ", build " + Launcher.BUILD); // Prepare version info (file) - info.setFileDescription("KeeperJerry's Launcher"); - info.setFileVersion("1.0.0.0"); + info.setFileDescription(server.config.launch4J.fileDesc); + info.setFileVersion(Launcher.VERSION); info.setTxtFileVersion(Launcher.VERSION + ", build " + Launcher.BUILD); info.setOriginalFilename(binaryFile.getFileName().toString()); // Prepare version info (misc) - info.setInternalName("Launcher"); - info.setCopyright("© KeeperJerry & sashok724 LLC"); - info.setTrademarks("This product is licensed under WTFPL 2.0"); - info.setLanguage(LanguageID.ENGLISH_US); + info.setInternalName(server.config.launch4J.internalName); + info.setCopyright(server.config.launch4J.copyright); + info.setTrademarks(server.config.launch4J.trademarks); + info.setLanguage(LanguageID.RUSSIAN); config.setVersionInfo(info); // Set JAR wrapping options diff --git a/Launcher/source/Launcher.java b/Launcher/source/Launcher.java index 9cdf24b..d782c2c 100644 --- a/Launcher/source/Launcher.java +++ b/Launcher/source/Launcher.java @@ -59,7 +59,7 @@ { // Version info @LauncherAPI - public static final String VERSION = "1.6.1"; + public static final String VERSION = "1.6.1.0"; @LauncherAPI public static final String BUILD = readBuildNumber(); @LauncherAPI diff --git a/buildnumber b/buildnumber index 52db24f..2040f28 100644 --- a/buildnumber +++ b/buildnumber @@ -1 +1 @@ -493, 09.12.2020 \ No newline at end of file +495, 09.12.2020 \ No newline at end of file