Skip to content

Commit 1fb9e5b

Browse files
committed
feat: add conscrypt + bug fix null parent
1 parent 22721e3 commit 1fb9e5b

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ public Integer call() {
110110
}
111111

112112
if (exempt != null) {
113-
final File converted = new File(exempt.getAbsolutePath()
114-
.substring(0, exempt.getAbsolutePath().lastIndexOf("/")) + "/config.hocon");
113+
final File converted = new File(new File(exempt.getAbsolutePath()).getParentFile().getAbsolutePath(), "config.hocon");
115114
final String warning = "\n" + ConsoleColors.YELLOW
116115
+ "██╗ ██╗ █████╗ ██████╗ ███╗ ██╗██╗███╗ ██╗ ██████╗ \n"
117116
+ "██║ ██║██╔══██╗██╔══██╗████╗ ██║██║████╗ ██║██╔════╝ \n"

dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/util/LogoUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static void printLogo() {
6161
" │ " + topMemory + " │",
6262
" └───────────────────────────────────────────┘",
6363
"",
64-
" Author: Ghast Version: 2.0.8 Today: "
64+
" Author: Ghast Version: 2.0.10 Today: "
6565
+ DateFormat.getDateTimeInstance().format(new Date(Instant.now().toEpochMilli())),
6666
""
6767
};

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/dependency/CommonDependency.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ public enum CommonDependency {
1010
public boolean test(List<String> strings) {
1111
return strings.stream().anyMatch(e -> e.contains("org/bukkit"));
1212
}
13-
});
13+
}),
14+
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() {
15+
@Override
16+
public boolean test(List<String> strings) {
17+
return strings.stream().anyMatch(e -> e.contains("org/conscrypt"));
18+
}
19+
})
20+
;
1421

1522
private final String url;
1623
private final DependencyMatcher matcher;

0 commit comments

Comments
 (0)