feat(all): prepare for 2.0.7

Author: terminalsin

dev.skidfuscator.annotations/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'dev.skidfuscator.community'
-version '2.0.0-SNAPSHOT'
+version '2.0.1-SNAPSHOT'
 
 repositories {
     mavenCentral()

dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/SkidfuscatorMain.java

@@ -17,6 +17,7 @@ public class SkidfuscatorMain {
 
     @SneakyThrows
     public static void main(String[] args) {
+
         if (args.length == 1 && args[0].equalsIgnoreCase("cli")) {
             final LineReader reader = LineReaderBuilder
                     .builder()
@@ -58,6 +59,7 @@ public static void main(String[] args) {
                             false,
                             false,
                             false,
+                            false,
                             false
                     );
 

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

@@ -80,12 +80,6 @@ public class ObfuscateCommand implements Callable<Integer> {
     )
     private boolean notrack;
 
-    @CommandLine.Option(
-            names = {"-re", "--renamer"},
-            description = "Enables renamer for the obfuscation"
-    )
-    private boolean renamer;
-
     @Override
     public Integer call()  {
         /* Total number of processors or cores available to the JVM */
@@ -206,7 +200,7 @@ public Integer call()  {
                 .jmod(MiscUtil.getJavaVersion() > 8)
                 .fuckit(fuckit)
                 .config(config)
-                .renamer(renamer)
+                .renamer(false)
                 .analytics(!notrack)
                 .build();
 

dev.skidfuscator.commons/src/main/java/dev/skidfuscator/config/DefaultConfig.java

@@ -21,13 +21,21 @@ public DefaultConfig(Config config, String path) {
     }
 
     public List<String> getExemptions() {
-        return getStringList(path + "exempt", new ArrayList<>());
+        return getStringList("exempt", new ArrayList<>());
     }
 
     public boolean getBoolean(String path, final boolean dflt) {
         return get(path, dflt, config::getBoolean);
     }
 
+    public String getString(String path, final String dflt) {
+        return get(path, dflt, config::getString);
+    }
+
+    public int getInt(String path, final int dflt) {
+        return get(path, dflt, config::getInt);
+    }
+
     public List<String> getStringList(String path, final List<String> dflt) {
         return get(path, dflt, config::getStringList);
     }
@@ -50,7 +58,7 @@ public <T> T get(String path, final T dflt, final Function<String, T> supplier)
             cache.put(path, var);
         }
 
-        assert dflt.getClass().isAssignableFrom(var.getClass()) : "Value loaded at path is not a type assigned!";
+        //assert var.getClass().isAssignableFrom(dflt.getClass()) : "Value loaded at path is not a type assigned! (" + var.getClass() + " vs " + dflt.getClass() + ")";
 
         return (T) var;
     }

dev.skidfuscator.commons/src/main/java/dev/skidfuscator/config/DefaultSkidConfig.java

@@ -11,7 +11,7 @@ public DefaultSkidConfig(Config config, String path) {
     }
 
     public boolean isDriver() {
-        return this.getBoolean("driver", true);
+        return this.getBoolean("driver.enabled", true);
     }
 
     public File[] getLibs() {

dev.skidfuscator.commons/src/main/java/dev/skidfuscator/obfuscator/SkidfuscatorSession.java

@@ -25,6 +25,7 @@ public class SkidfuscatorSession {
     private boolean c2j;
 
     private boolean lowCon;
+    private boolean dex;
 
 
     /**
@@ -35,6 +36,10 @@ public File getInput() {
         return input;
     }
 
+    public void setInput(File input) {
+        this.input = input;
+    }
+
     /**
      * @return the output
      */
@@ -103,19 +108,7 @@ public boolean isAnalytics() {
         return analytics;
     }
 
-    public boolean isRenamer() {
-        return renamer;
-    }
-
-    public boolean isNative() {
-        return c2j;
-    }
-
-    public boolean isLowCon() {
-        return lowCon;
-    }
-
-    public void setLowCon(boolean lowCon) {
-        this.lowCon = lowCon;
+    public boolean isDex() {
+        return dex;
     }
 }

dev.skidfuscator.commons/src/main/resources/defaultConfig.hocon

@@ -25,6 +25,11 @@ stringAnnotationEncryption {
   exempt: []
 }
 
+exceptionReturn {
+  enabled: true
+  exempt: []
+}
+
 flowCondition {
   enabled: true
   exempt: []
@@ -66,17 +71,42 @@ native: {
   exempt: []
 }
 
+driver: {
+  enabled: false
+}
+
+reference {
+  enabled: false
+}
+
+fileCrasher: {
+  enabled: false
+}
+
 classRenamer {
   enabled: false
-  exempt: []
+  type: CUSTOM
+  prefix: "skido/"
+  chars: [
+    "K"
+    "oO",
+    "o0"
+  ]
+  depth: 3
 }
 
 methodRenamer {
   enabled: false
-  exempt: []
+  type: CUSTOM
+  chars: [
+    "K"
+    "oO",
+    "o0"
+  ]
+  depth: 3
 }
 
 fieldRenamer {
   enabled: false
-  exempt: []
+  type: ALPHABETICAL
 }

dev.skidfuscator.obfuscator/build.gradle

@@ -21,6 +21,7 @@ dependencies {
     implementation 'com.github.matomo-org:matomo-java-tracker:v1.7'
     api 'com.github.Col-E:jphantom:1.4.3'
     implementation 'dev.dirs:directories:26'
+
     testAnnotationProcessor 'org.projectlombok:lombok:1.18.24'
     implementation 'org.fusesource.jansi:jansi:2.4.0'
     implementation 'org.yaml:snakeyaml:1.33'

dev.skidfuscator.obfuscator/out/production/resources/log4j.properties

@@ -0,0 +1,22 @@
+# Redirect log messages to console
+log4j.rootLogger=DEBUG, stdout
+log4j.rootLogger=ERROR, stderr
+log4j.rootLogger=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p - %m%n
+
+log4j.appender.stderr=org.apache.log4j.ConsoleAppender
+log4j.appender.stderr.Target=System.err
+log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
+log4j.appender.stderr.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p - %m%n
+
+# Redirect log messages to a log file, support file rolling.
+# log4j.appender.file=org.apache.log4j.RollingFileAppender
+# log4j.appender.file.File=C:\\log4j-application.log
+# log4j.appender.file.MaxFileSize=5MB
+# log4j.appender.file.MaxBackupIndex=10
+# log4j.appender.file.layout=org.apache.log4j.PatternLayout
+# log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n