Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Konloch/bytecode-viewer

Browse source
This commit is contained in:
Konloch 2021-07-16 12:16:06 -07:00
commit 130eddc7cc
7 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
pom.xml
View file

@ -13,14 +13,18 @@
</properties> </properties>
<repositories> <repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository> <repository>
<id>local-maven-repo</id> <id>local-maven-repo</id>
<url>file:///${project.basedir}/libs</url> <url>file:///${project.basedir}/libs</url>
</repository> </repository>
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository> <!-- TODO Remove when DarkLaf is properly updated -->
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
@ -37,27 +41,27 @@
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>9.1</version> <version>9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId> <artifactId>asm-analysis</artifactId>
<version>9.1</version> <version>9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId> <artifactId>asm-commons</artifactId>
<version>9.1</version> <version>9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId> <artifactId>asm-tree</artifactId>
<version>9.1</version> <version>9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId> <artifactId>asm-util</artifactId>
<version>9.1</version> <version>9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.benf</groupId> <groupId>org.benf</groupId>
@ -82,17 +86,17 @@
<dependency> <dependency>
<groupId>org.codehaus.janino</groupId> <groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId> <artifactId>commons-compiler</artifactId>
<version>3.1.3</version> <version>3.1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId> <artifactId>commons-compress</artifactId>
<version>1.20</version> <version>1.21</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.10.0</version> <version>2.11.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
@ -127,7 +131,7 @@
<dependency> <dependency>
<groupId>org.codehaus.janino</groupId> <groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId> <artifactId>janino</artifactId>
<version>3.1.3</version> <version>3.1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.jd</groupId> <groupId>com.jd</groupId>
@ -177,7 +181,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.30</version> <version>1.7.31</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.smali</groupId> <groupId>org.smali</groupId>
@ -192,7 +196,7 @@
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.28</version> <version>1.29</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xpp3</groupId> <groupId>xpp3</groupId>
@ -222,7 +226,7 @@
<dependency> <dependency>
<groupId>com.github.weisj</groupId> <groupId>com.github.weisj</groupId>
<artifactId>darklaf-core</artifactId> <artifactId>darklaf-core</artifactId>
<version>2.5.5</version> <version>2.6.2-SNAPSHOT</version> <!-- TODO Change to release when ready -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.weisj</groupId> <groupId>com.github.weisj</groupId>

2
src/main/java/the/bytecode/club/bytecodeviewer/Constants.java
View file

@ -1,5 +1,6 @@
package the.bytecode.club.bytecodeviewer; package the.bytecode.club.bytecodeviewer;
import org.objectweb.asm.Opcodes;
import the.bytecode.club.bytecodeviewer.resources.ResourceType; import the.bytecode.club.bytecodeviewer.resources.ResourceType;
import java.io.File; import java.io.File;
@ -38,6 +39,7 @@ public class Constants
public static String krakatauWorkingDirectory = getBCVDirectory() + fs + "krakatau_" + krakatauVersion; public static String krakatauWorkingDirectory = getBCVDirectory() + fs + "krakatau_" + krakatauVersion;
public static String enjarifyWorkingDirectory = getBCVDirectory() + fs + "enjarify_" + enjarifyVersion; public static String enjarifyWorkingDirectory = getBCVDirectory() + fs + "enjarify_" + enjarifyVersion;
public static final String[] SUPPORTED_FILE_EXTENSIONS = ResourceType.supportedBCVExtensionMap.keySet().toArray(new String[0]); public static final String[] SUPPORTED_FILE_EXTENSIONS = ResourceType.supportedBCVExtensionMap.keySet().toArray(new String[0]);
public static final int ASM_VERSION = Opcodes.ASM9;
public static final PrintStream ERR = System.err; public static final PrintStream ERR = System.err;
public static final PrintStream OUT = System.out; public static final PrintStream OUT = System.out;

4
src/main/java/the/bytecode/club/bytecodeviewer/obfuscators/mapping/RemappingAnnotationAdapter.java
View file

@ -31,8 +31,8 @@
package the.bytecode.club.bytecodeviewer.obfuscators.mapping; package the.bytecode.club.bytecodeviewer.obfuscators.mapping;
import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.commons.Remapper; import org.objectweb.asm.commons.Remapper;
import the.bytecode.club.bytecodeviewer.Constants;
/** /**
* An {@link AnnotationVisitor} adapter for type remapping. * An {@link AnnotationVisitor} adapter for type remapping.
@ -45,7 +45,7 @@ public class RemappingAnnotationAdapter extends AnnotationVisitor {
public RemappingAnnotationAdapter(final AnnotationVisitor av, public RemappingAnnotationAdapter(final AnnotationVisitor av,
final org.objectweb.asm.commons.Remapper remapper) { final org.objectweb.asm.commons.Remapper remapper) {
this(Opcodes.ASM5, av, remapper); this(Constants.ASM_VERSION, av, remapper);
} }
protected RemappingAnnotationAdapter(final int api, protected RemappingAnnotationAdapter(final int api,

4
src/main/java/the/bytecode/club/bytecodeviewer/obfuscators/mapping/RemappingClassAdapter.java
View file

@ -34,8 +34,8 @@ import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.TypePath; import org.objectweb.asm.TypePath;
import the.bytecode.club.bytecodeviewer.Constants;
/** /**
* A {@link ClassVisitor} for type remapping. * A {@link ClassVisitor} for type remapping.
@ -49,7 +49,7 @@ public class RemappingClassAdapter extends ClassVisitor {
protected String className; protected String className;
public RemappingClassAdapter(final ClassVisitor cv, final Remapper remapper) { public RemappingClassAdapter(final ClassVisitor cv, final Remapper remapper) {
this(Opcodes.ASM5, cv, remapper); this(Constants.ASM_VERSION, cv, remapper);
} }
protected RemappingClassAdapter(final int api, final ClassVisitor cv, protected RemappingClassAdapter(final int api, final ClassVisitor cv,

4
src/main/java/the/bytecode/club/bytecodeviewer/obfuscators/mapping/RemappingFieldAdapter.java
View file

@ -32,9 +32,9 @@ package the.bytecode.club.bytecodeviewer.obfuscators.mapping;
import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.TypePath; import org.objectweb.asm.TypePath;
import org.objectweb.asm.commons.Remapper; import org.objectweb.asm.commons.Remapper;
import the.bytecode.club.bytecodeviewer.Constants;
/** /**
* A {@link FieldVisitor} adapter for type remapping. * A {@link FieldVisitor} adapter for type remapping.
@ -46,7 +46,7 @@ public class RemappingFieldAdapter extends FieldVisitor {
private final org.objectweb.asm.commons.Remapper remapper; private final org.objectweb.asm.commons.Remapper remapper;
public RemappingFieldAdapter(final FieldVisitor fv, final org.objectweb.asm.commons.Remapper remapper) { public RemappingFieldAdapter(final FieldVisitor fv, final org.objectweb.asm.commons.Remapper remapper) {
this(Opcodes.ASM5, fv, remapper); this(Constants.ASM_VERSION, fv, remapper);
} }
protected RemappingFieldAdapter(final int api, final FieldVisitor fv, protected RemappingFieldAdapter(final int api, final FieldVisitor fv,

7
src/main/java/the/bytecode/club/bytecodeviewer/obfuscators/mapping/RemappingMethodAdapter.java
View file

@ -38,6 +38,7 @@ import org.objectweb.asm.Opcodes;
import org.objectweb.asm.TypePath; import org.objectweb.asm.TypePath;
import org.objectweb.asm.commons.LocalVariablesSorter; import org.objectweb.asm.commons.LocalVariablesSorter;
import org.objectweb.asm.commons.Remapper; import org.objectweb.asm.commons.Remapper;
import the.bytecode.club.bytecodeviewer.Constants;
/** /**
* A {@link LocalVariablesSorter} for type mapping. * A {@link LocalVariablesSorter} for type mapping.
@ -50,7 +51,7 @@ public class RemappingMethodAdapter extends LocalVariablesSorter {
public RemappingMethodAdapter(final int access, final String desc, public RemappingMethodAdapter(final int access, final String desc,
final MethodVisitor mv, final org.objectweb.asm.commons.Remapper remapper) { final MethodVisitor mv, final org.objectweb.asm.commons.Remapper remapper) {
this(Opcodes.ASM5, access, desc, mv, remapper); this(Constants.ASM_VERSION, access, desc, mv, remapper);
} }
protected RemappingMethodAdapter(final int api, final int access, protected RemappingMethodAdapter(final int api, final int access,
@ -125,7 +126,7 @@ public class RemappingMethodAdapter extends LocalVariablesSorter {
@Override @Override
public void visitMethodInsn(final int opcode, final String owner, public void visitMethodInsn(final int opcode, final String owner,
final String name, final String desc) { final String name, final String desc) {
if (api >= Opcodes.ASM5) { if (api >= Constants.ASM_VERSION) {
super.visitMethodInsn(opcode, owner, name, desc); super.visitMethodInsn(opcode, owner, name, desc);
return; return;
} }
@ -136,7 +137,7 @@ public class RemappingMethodAdapter extends LocalVariablesSorter {
@Override @Override
public void visitMethodInsn(final int opcode, final String owner, public void visitMethodInsn(final int opcode, final String owner,
final String name, final String desc, final boolean itf) { final String name, final String desc, final boolean itf) {
if (api < Opcodes.ASM5) { if (api < Constants.ASM_VERSION) {
super.visitMethodInsn(opcode, owner, name, desc, itf); super.visitMethodInsn(opcode, owner, name, desc, itf);
return; return;
} }

4
src/main/java/the/bytecode/club/bytecodeviewer/obfuscators/mapping/RemappingSignatureAdapter.java
View file

@ -30,9 +30,9 @@
package the.bytecode.club.bytecodeviewer.obfuscators.mapping; package the.bytecode.club.bytecodeviewer.obfuscators.mapping;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.commons.Remapper; import org.objectweb.asm.commons.Remapper;
import org.objectweb.asm.signature.SignatureVisitor; import org.objectweb.asm.signature.SignatureVisitor;
import the.bytecode.club.bytecodeviewer.Constants;
/** /**
* A {@link SignatureVisitor} adapter for type mapping. * A {@link SignatureVisitor} adapter for type mapping.
@ -49,7 +49,7 @@ public class RemappingSignatureAdapter extends SignatureVisitor {
public RemappingSignatureAdapter(final SignatureVisitor v, public RemappingSignatureAdapter(final SignatureVisitor v,
final org.objectweb.asm.commons.Remapper remapper) { final org.objectweb.asm.commons.Remapper remapper) {
this(Opcodes.ASM5, v, remapper); this(Constants.ASM_VERSION, v, remapper);
} }
protected RemappingSignatureAdapter(final int api, protected RemappingSignatureAdapter(final int api,