diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index 3bae29c2..2313f844 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -78,7 +78,7 @@ bundle project(':Radon') } compileOnlyA 'com.google.guava:guava:26.0-jre' - compileOnlyA 'org.apache.logging.log4j:log4j-core:2.11.2' + compileOnlyA 'log4j:log4j:1.2.17' // Do not update (laggy dep). } task hikari(type: Copy) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java index ad822558..9649a004 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java @@ -9,6 +9,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.util.List; import java.util.stream.Collectors; @@ -31,6 +32,7 @@ public String getName() { @Override public Path process(Path inputFile) throws IOException { Path outputFile = srv.launcherBinary.nextLowerPath(this); + Files.deleteIfExists(outputFile); if (srv.config.enabledRadon) { if (!IOHelper.isFile(config)) UnpackHelper.unpack(IOHelper.getResourceURL("ru/gravit/launchserver/defaults/radon.cfg"), config); diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/proguard.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/proguard.cfg index e4af2c51..51148877 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/proguard.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/proguard.cfg @@ -20,9 +20,9 @@ -keepattributes Signature -adaptresourcefilecontents META-INF/MANIFEST.MF --keeppackagenames com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,oshi.**,com.sun.jna.**,com.google.gson.** +-keeppackagenames com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,oshi.**,com.sun.jna.**,com.google.gson.**,org.slf4j.**,oshi.jna.**,com.sun.jna.**,org.apache.commons.logging.**, org.fusesource.** --keep class com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,oshi.**,com.sun.jna.**,com.google.gson.**,org.slf4j.**,oshi.jna.**,com.sun.jna.**,org.apache.commons.logging.** { +-keep class com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,oshi.**,com.sun.jna.**,com.google.gson.**,org.slf4j.**,oshi.jna.**,com.sun.jna.**,org.apache.commons.logging.**, org.fusesource.** { *; } diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 12715480..f01e92e7 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -39,6 +39,7 @@ pack project(':LauncherAPI') // Not error on obf. bundle 'com.github.oshi:oshi-core:3.13.0' bundle 'com.jfoenix:jfoenix:8.0.8' bundle 'de.jensd:fontawesomefx:8.9' + bundle 'org.fusesource.jansi:jansi:1.17.1' pack 'org.ow2.asm:asm-tree:7.1' }