Skip to content

Commit 1208957

Browse files
committed
fix: merge pure hash to independent transformer
1 parent bf6ce5a commit 1208957

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import dev.skidfuscator.obfuscator.transform.impl.flow.interprocedural.RandomInitTransformer;
5353
import dev.skidfuscator.obfuscator.transform.impl.misc.AhegaoTransformer;
5454
import dev.skidfuscator.obfuscator.transform.impl.number.NumberTransformer;
55+
import dev.skidfuscator.obfuscator.transform.impl.pure.PureHashTransformer;
5556
import dev.skidfuscator.obfuscator.transform.impl.string.StringEncryptionType;
5657
import dev.skidfuscator.obfuscator.transform.impl.string.StringTransformerV2;
5758
import dev.skidfuscator.obfuscator.util.ConsoleColors;
@@ -684,6 +685,7 @@ public List<Transformer> getTransformers() {
684685
new BasicConditionTransformer(this),
685686
new BasicExceptionTransformer(this),
686687
new BasicRangeTransformer(this),
688+
new PureHashTransformer(this),
687689
/*
688690
new FlatteningFlowTransformer(this),*/
689691
new AhegaoTransformer(this)

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/predicate/renderer/IntegerBlockPredicateRenderer.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public IntegerBlockPredicateRenderer(Skidfuscator skidfuscator, List<Transformer
6969

7070
public static boolean DEBUG = false;
7171

72-
@Listen
72+
@Listen(EventPriority.HIGHEST)
7373
void handle(final InitSkidTransformEvent event) {
7474
final String factoryName = RandomUtil.randomAlphabeticalString(16) + "/" + RandomUtil.randomAlphabeticalString(16);
7575
final SkidClassNode factory = new SkidClassNodeBuilder(skidfuscator)
@@ -97,13 +97,7 @@ void handle(final InitSkidTransformEvent event) {
9797

9898
skidfuscator.setLegacyHasher(new LegacyHashTransformer(skidfuscator));
9999
skidfuscator.setBitwiseHasher(new BitwiseHashTransformer(skidfuscator));
100-
101-
try {
102-
skidfuscator.setVmHasher(new VmHashTransformer(skidfuscator));
103-
} catch (Exception e) {
104-
e.printStackTrace();
105-
System.exit(1);
106-
}
100+
skidfuscator.setVmHasher(new BitwiseHashTransformer(skidfuscator));
107101
}
108102

109103
/**
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package dev.skidfuscator.obfuscator.transform.impl.pure;
2+
3+
import dev.skidfuscator.obfuscator.Skidfuscator;
4+
import dev.skidfuscator.obfuscator.event.EventPriority;
5+
import dev.skidfuscator.obfuscator.event.annotation.Listen;
6+
import dev.skidfuscator.obfuscator.event.impl.transform.skid.InitSkidTransformEvent;
7+
import dev.skidfuscator.obfuscator.number.pure.VmHashTransformer;
8+
import dev.skidfuscator.obfuscator.transform.AbstractTransformer;
9+
10+
public class PureHashTransformer extends AbstractTransformer {
11+
public PureHashTransformer(Skidfuscator skidfuscator) {
12+
super(skidfuscator, "Pure Encryption");
13+
}
14+
15+
@Listen
16+
void handle(final InitSkidTransformEvent event) {
17+
skidfuscator.setVmHasher(new VmHashTransformer(skidfuscator));
18+
}
19+
}

0 commit comments

Comments
 (0)