feat: add conscrypt + bug fix null parent

skidfuscatordev · Nov 13, 2024 · 1fb9e5b · 1fb9e5b
1 parent 22721e3
commit 1fb9e5b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java b/...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/...idfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/util/LogoUtil.java b/...idfuscator.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/...tor.obfuscator/src/main/java/dev/skidfuscator/obfuscator/dependency/CommonDependency.java b/...tor.obfuscator/src/main/java/dev/skidfuscator/obfuscator/dependency/CommonDependency.java
@@ -10,7 +10,14 @@ public enum CommonDependency {
         public boolean test(List<String> 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<String> strings) {
+            return strings.stream().anyMatch(e -> e.contains("org/conscrypt"));
+        }
+    })
+    ;
 
     private final String url;
     private final DependencyMatcher matcher;