Merge pull request #60 from tidyycode/master

Fixed ahegao failing issue

Author: terminalsin

build.gradle

@@ -23,6 +23,10 @@ allprojects {
         testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
         testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
     }
+
+    compileJava {
+        options.encoding = "UTF-8" // Will fail on the non-ascii comments if not set
+    }
 }
 
 group 'dev.skidfuscator.community'

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/impl/misc/AhegaoTransformer.java

@@ -26,8 +26,13 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Stack;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
 
 public class AhegaoTransformer extends AbstractTransformer {
+
+    private static final String DEFAULT_AHEGAO_FIELD_NAME = "nothing_to_see_here";
+
     public AhegaoTransformer(Skidfuscator skidfuscator) {
         super(skidfuscator, "Ahegao");
     }
@@ -43,9 +48,17 @@ void handle(final FinalClassTransformEvent event) {
             return;
         }
 
+        List<String> fieldNames = classNode.getFields().stream()
+                .map(FieldNode::getName)
+                .collect(Collectors.toList());
+
+        String ahegaoName = DEFAULT_AHEGAO_FIELD_NAME;
+        while (fieldNames.contains(ahegaoName))
+            ahegaoName += (char) ThreadLocalRandom.current().nextInt(Character.MAX_CODE_POINT);
+
         final FieldNode mapleNode = new SkidFieldNodeBuilder(skidfuscator, classNode)
                 .access(Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC)
-                .name("nothing_to_see_here")
+                .name(ahegaoName)
                 .desc("[Ljava/lang/String;")
                 .signature(null)
                 .value(null)