Skip to content
This repository was archived by the owner on Sep 5, 2025. It is now read-only.

Commit 9a97ae3

Browse files
4ra1n4ra1n
committed
CODE FORMAT
1 parent 59d6539 commit 9a97ae3

File tree

4 files changed

+35
-38
lines changed

4 files changed

+35
-38
lines changed

‎src/main/java/me/n1ar4/jar/obfuscator/asm/MethodNameChanger.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,17 @@
88
import org.objectweb.asm.*;
99

1010
import java.util.ArrayList;
11-
import java.util.Arrays;
1211
import java.util.List;
1312
import java.util.Map;
1413

1514
@SuppressWarnings("all")
1615
public class MethodNameChanger extends ClassVisitor {
1716
private String owner;
18-
private final List<String> methodBlackList;
1917
private final List<MethodReference> ignoreMethods = new ArrayList<>();
2018
private final List<String> ignoreMethodString = new ArrayList<>();
2119

2220
public MethodNameChanger(ClassVisitor classVisitor) {
2321
super(Const.ASMVersion, classVisitor);
24-
this.methodBlackList = Arrays.asList(ObfEnv.config.getMethodBlackList());
2522
}
2623

2724
@Override

‎src/main/java/me/n1ar4/jar/obfuscator/core/Runner.java‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import me.n1ar4.jar.obfuscator.utils.*;
1515
import me.n1ar4.log.LogManager;
1616
import me.n1ar4.log.Logger;
17-
import me.n1ar4.log.LoggingStream;
1817

1918
import java.io.File;
2019
import java.io.IOException;
@@ -133,44 +132,44 @@ public static void run(Path path, BaseConfig config) {
133132
} else {
134133
newPackageNameS = packageNameS;
135134
}
136-
135+
137136
// 修复 enableClassName: false & enablePackageName: true 时混淆未正确生效 BUG
138137
String originalName = c.getName();
139138
String finalName = originalName;
140-
139+
141140
boolean notInWhiteList = PackageUtil.notInWhiteList(packageNameS, config);
142141
boolean inBlackClass = PackageUtil.inBlackClass(originalName, config);
143142
boolean inRootPackage = PackageUtil.inRootPackage(originalName, config);
144143
if (!(notInWhiteList || inBlackClass) || inRootPackage) {
145-
String result = ObfEnv.classNameObfMapping.putIfAbsent(originalName, originalName);
146-
if (result == null) {
147-
boolean isEnablePackageName = config.isEnablePackageName();
148-
boolean isEnableClassName = config.isEnableClassName();
149-
if (!inBlackClass && (isEnablePackageName || isEnableClassName)) {
150-
String finalPackageName = packageNameS;
151-
if (isEnablePackageName) {
152-
finalPackageName = newPackageNameS;
153-
}
154-
if (isEnableClassName) {
155-
if (className.contains("$")) {
156-
String outerClassName = originalName.split("\\$")[0];
157-
String exist = ObfEnv.classNameObfMapping.get(outerClassName);
158-
if (exist == null) {
159-
exist = finalPackageName + "/" + NameUtil.genNewName();
160-
ObfEnv.classNameObfMapping.put(outerClassName, exist);
161-
}
162-
finalName = exist + "$" + NameUtil.genNewName();
163-
} else {
164-
finalName = finalPackageName + "/" + NameUtil.genNewName();
165-
}
166-
} else {
167-
finalName = finalPackageName + "/" + className;
168-
}
169-
ObfEnv.classNameObfMapping.put(originalName, finalName);
170-
}
171-
}
144+
String result = ObfEnv.classNameObfMapping.putIfAbsent(originalName, originalName);
145+
if (result == null) {
146+
boolean isEnablePackageName = config.isEnablePackageName();
147+
boolean isEnableClassName = config.isEnableClassName();
148+
if (!inBlackClass && (isEnablePackageName || isEnableClassName)) {
149+
String finalPackageName = packageNameS;
150+
if (isEnablePackageName) {
151+
finalPackageName = newPackageNameS;
152+
}
153+
if (isEnableClassName) {
154+
if (className.contains("$")) {
155+
String outerClassName = originalName.split("\\$")[0];
156+
String exist = ObfEnv.classNameObfMapping.get(outerClassName);
157+
if (exist == null) {
158+
exist = finalPackageName + "/" + NameUtil.genNewName();
159+
ObfEnv.classNameObfMapping.put(outerClassName, exist);
160+
}
161+
finalName = exist + "$" + NameUtil.genNewName();
162+
} else {
163+
finalName = finalPackageName + "/" + NameUtil.genNewName();
164+
}
165+
} else {
166+
finalName = finalPackageName + "/" + className;
167+
}
168+
ObfEnv.classNameObfMapping.put(originalName, finalName);
169+
}
170+
}
172171
}
173-
172+
174173
if (originalName.equals(ObfEnv.MAIN_CLASS)) {
175174
ObfEnv.NEW_MAIN_CLASS = finalName.replace("/", ".");
176175
logger.info("new main: {}", ObfEnv.NEW_MAIN_CLASS);

‎src/main/java/me/n1ar4/jar/obfuscator/utils/NameUtil.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ public static String genPackage() {
3131
public static String genWithSet(HashSet<String> exists) {
3232
JRandom random = JRandom.getInstance();
3333
while (true) {
34-
int length = 10 + random.getInt(0,3);
34+
int length = 10 + random.getInt(0, 3);
3535
StringBuilder sb = new StringBuilder();
3636
for (int i = 0; i < length; i++) {
37-
sb.append(CHAR_POOL[random.getInt(0,CHAR_POOL.length)]);
37+
sb.append(CHAR_POOL[random.getInt(0, CHAR_POOL.length)]);
3838
}
3939
if (sb.charAt(0) == '~' || sb.charAt(0) == '1') {
4040
continue;
@@ -50,10 +50,10 @@ public static String genWithSet(HashSet<String> exists) {
5050
private static String genBase(int op) {
5151
JRandom random = JRandom.getInstance();
5252
while (true) {
53-
int length = 10 + random.getInt(0,3);
53+
int length = 10 + random.getInt(0, 3);
5454
StringBuilder sb = new StringBuilder();
5555
for (int i = 0; i < length; i++) {
56-
sb.append(CHAR_POOL[random.getInt(0,CHAR_POOL.length)]);
56+
sb.append(CHAR_POOL[random.getInt(0, CHAR_POOL.length)]);
5757
}
5858
if (sb.charAt(0) == '~' || sb.charAt(0) == '1') {
5959
continue;

‎src/main/java/me/n1ar4/jar/obfuscator/utils/PackageUtil.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
public class PackageUtil {
1414
private static final List<String> internalList = new ArrayList<>();
15+
1516
public static void buildInternalBlackList() {
1617
// JNI 的 CLASS 默认加到黑名单里面
1718
for (Map.Entry<ClassReference.Handle, List<MethodReference>> entry :

0 commit comments

Comments
 (0)