diff --git a/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java b/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java index 142c6b6..3cc2d55 100644 --- a/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java +++ b/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java @@ -110,8 +110,7 @@ public Integer call() { } if (exempt != null) { - final File converted = new File(exempt.getAbsolutePath() - .substring(0, exempt.getAbsolutePath().lastIndexOf("/")) + "/config.hocon"); + final File converted = new File(new File(exempt.getAbsolutePath()).getParentFile().getAbsolutePath(), "config.hocon"); final String warning = "\n" + ConsoleColors.YELLOW + "██╗ ██╗ █████╗ ██████╗ ███╗ ██╗██╗███╗ ██╗ ██████╗ \n" + "██║ ██║██╔══██╗██╔══██╗████╗ ██║██║████╗ ██║██╔════╝ \n" diff --git a/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/util/LogoUtil.java b/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/util/LogoUtil.java index 3d7bbc6..228f70c 100644 --- a/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/util/LogoUtil.java +++ b/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/util/LogoUtil.java @@ -61,7 +61,7 @@ public static void printLogo() { " │ " + topMemory + " │", " └───────────────────────────────────────────┘", "", - " Author: Ghast Version: 2.0.8 Today: " + " Author: Ghast Version: 2.0.10 Today: " + DateFormat.getDateTimeInstance().format(new Date(Instant.now().toEpochMilli())), "" }; diff --git a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/dependency/CommonDependency.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/dependency/CommonDependency.java index 026f2ac..626faf7 100644 --- a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/dependency/CommonDependency.java +++ b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/dependency/CommonDependency.java @@ -10,7 +10,14 @@ public enum CommonDependency { public boolean test(List strings) { return strings.stream().anyMatch(e -> e.contains("org/bukkit")); } - }); + }), + CONSCRYPT("https://raw.githubusercontent.com/skidfuscatordev/mappings/refs/heads/main/conscrypt/2.5.2/org.conscrypt.conscrypt-openjdk-uber-2.5.2.json", new DependencyMatcher() { + @Override + public boolean test(List strings) { + return strings.stream().anyMatch(e -> e.contains("org/conscrypt")); + } + }) + ; private final String url; private final DependencyMatcher matcher;