Refactor package structure of the asm module

bzip2
Graham 5 years ago
parent 0c8d0f9cc3
commit 12293bb3b1
  1. 1
      asm/src/main/java/dev/openrs2/asm/classpath/ClassPath.java
  2. 2
      asm/src/main/java/dev/openrs2/asm/classpath/Library.java
  3. 2
      asm/src/main/java/dev/openrs2/asm/transform/Transformer.java
  4. 4
      deob/src/main/java/dev/openrs2/deob/Deobfuscator.java
  5. 2
      deob/src/main/java/dev/openrs2/deob/SignedClassSet.java
  6. 2
      deob/src/main/java/dev/openrs2/deob/remap/ClassNamePrefixer.java
  7. 2
      deob/src/main/java/dev/openrs2/deob/transform/BitShiftTransformer.java
  8. 2
      deob/src/main/java/dev/openrs2/deob/transform/CanvasTransformer.java
  9. 2
      deob/src/main/java/dev/openrs2/deob/transform/ClassForNameTransformer.java
  10. 2
      deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.java
  11. 2
      deob/src/main/java/dev/openrs2/deob/transform/ExceptionTracingTransformer.java
  12. 2
      deob/src/main/java/dev/openrs2/deob/transform/FieldOrderTransformer.java
  13. 4
      deob/src/main/java/dev/openrs2/deob/transform/OpaquePredicateTransformer.java
  14. 2
      deob/src/main/java/dev/openrs2/deob/transform/OriginalNameTransformer.java

@ -8,7 +8,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import dev.openrs2.asm.Library;
import dev.openrs2.asm.MemberDesc; import dev.openrs2.asm.MemberDesc;
import dev.openrs2.asm.MemberRef; import dev.openrs2.asm.MemberRef;
import dev.openrs2.util.collect.DisjointSet; import dev.openrs2.util.collect.DisjointSet;

@ -1,4 +1,4 @@
package dev.openrs2.asm; package dev.openrs2.asm.classpath;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;

@ -1,4 +1,4 @@
package dev.openrs2.asm; package dev.openrs2.asm.transform;
import dev.openrs2.asm.classpath.ClassPath; import dev.openrs2.asm.classpath.ClassPath;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;

@ -6,9 +6,9 @@ import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.List; import java.util.List;
import dev.openrs2.asm.Library;
import dev.openrs2.asm.Transformer;
import dev.openrs2.asm.classpath.ClassPath; import dev.openrs2.asm.classpath.ClassPath;
import dev.openrs2.asm.classpath.Library;
import dev.openrs2.asm.transform.Transformer;
import dev.openrs2.deob.remap.ClassNamePrefixer; import dev.openrs2.deob.remap.ClassNamePrefixer;
import dev.openrs2.deob.remap.TypedRemapper; import dev.openrs2.deob.remap.TypedRemapper;
import dev.openrs2.deob.transform.BitShiftTransformer; import dev.openrs2.deob.transform.BitShiftTransformer;

@ -6,7 +6,7 @@ import java.util.Set;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import dev.openrs2.asm.InsnMatcher; import dev.openrs2.asm.InsnMatcher;
import dev.openrs2.asm.Library; import dev.openrs2.asm.classpath.Library;
import org.objectweb.asm.Type; import org.objectweb.asm.Type;
import org.objectweb.asm.commons.ClassRemapper; import org.objectweb.asm.commons.ClassRemapper;
import org.objectweb.asm.commons.SimpleRemapper; import org.objectweb.asm.commons.SimpleRemapper;

@ -2,7 +2,7 @@ package dev.openrs2.deob.remap;
import java.util.HashMap; import java.util.HashMap;
import dev.openrs2.asm.Library; import dev.openrs2.asm.classpath.Library;
import dev.openrs2.deob.transform.ClassForNameTransformer; import dev.openrs2.deob.transform.ClassForNameTransformer;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.objectweb.asm.commons.ClassRemapper; import org.objectweb.asm.commons.ClassRemapper;

@ -4,8 +4,8 @@ import java.util.Set;
import dev.openrs2.asm.InsnMatcher; import dev.openrs2.asm.InsnMatcher;
import dev.openrs2.asm.InsnNodeUtils; import dev.openrs2.asm.InsnNodeUtils;
import dev.openrs2.asm.Transformer;
import dev.openrs2.asm.classpath.ClassPath; import dev.openrs2.asm.classpath.ClassPath;
import dev.openrs2.asm.transform.Transformer;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.MethodNode;

@ -1,6 +1,6 @@
package dev.openrs2.deob.transform; package dev.openrs2.deob.transform;
import dev.openrs2.asm.Transformer; import dev.openrs2.asm.transform.Transformer;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.ClassNode;

@ -3,7 +3,7 @@ package dev.openrs2.deob.transform;
import java.util.List; import java.util.List;
import dev.openrs2.asm.InsnMatcher; import dev.openrs2.asm.InsnMatcher;
import dev.openrs2.asm.Transformer; import dev.openrs2.asm.transform.Transformer;
import org.objectweb.asm.commons.Remapper; import org.objectweb.asm.commons.Remapper;
import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.ClassNode;

@ -7,8 +7,8 @@ import java.util.Set;
import dev.openrs2.asm.InsnMatcher; import dev.openrs2.asm.InsnMatcher;
import dev.openrs2.asm.MemberRef; import dev.openrs2.asm.MemberRef;
import dev.openrs2.asm.Transformer;
import dev.openrs2.asm.classpath.ClassPath; import dev.openrs2.asm.classpath.ClassPath;
import dev.openrs2.asm.transform.Transformer;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.ClassNode;

@ -2,8 +2,8 @@ package dev.openrs2.deob.transform;
import dev.openrs2.asm.InsnMatcher; import dev.openrs2.asm.InsnMatcher;
import dev.openrs2.asm.InsnNodeUtils; import dev.openrs2.asm.InsnNodeUtils;
import dev.openrs2.asm.Transformer;
import dev.openrs2.asm.classpath.ClassPath; import dev.openrs2.asm.classpath.ClassPath;
import dev.openrs2.asm.transform.Transformer;
import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.MethodNode;
import org.slf4j.Logger; import org.slf4j.Logger;

@ -3,7 +3,7 @@ package dev.openrs2.deob.transform;
import java.util.HashMap; import java.util.HashMap;
import dev.openrs2.asm.MemberDesc; import dev.openrs2.asm.MemberDesc;
import dev.openrs2.asm.Transformer; import dev.openrs2.asm.transform.Transformer;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.FieldInsnNode; import org.objectweb.asm.tree.FieldInsnNode;

@ -5,10 +5,10 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import dev.openrs2.asm.InsnMatcher; import dev.openrs2.asm.InsnMatcher;
import dev.openrs2.asm.Library;
import dev.openrs2.asm.MemberRef; import dev.openrs2.asm.MemberRef;
import dev.openrs2.asm.Transformer;
import dev.openrs2.asm.classpath.ClassPath; import dev.openrs2.asm.classpath.ClassPath;
import dev.openrs2.asm.classpath.Library;
import dev.openrs2.asm.transform.Transformer;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.ClassNode;

@ -3,7 +3,7 @@ package dev.openrs2.deob.transform;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import dev.openrs2.asm.Transformer; import dev.openrs2.asm.transform.Transformer;
import dev.openrs2.deob.annotation.OriginalArg; import dev.openrs2.deob.annotation.OriginalArg;
import dev.openrs2.deob.annotation.OriginalClass; import dev.openrs2.deob.annotation.OriginalClass;
import dev.openrs2.deob.annotation.OriginalMember; import dev.openrs2.deob.annotation.OriginalMember;

Loading…
Cancel
Save