Skip to content

Commit 760495e

Browse files
committed
chore: bump cafedude
1 parent 2110634 commit 760495e

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
group 'dev.xdark'
6-
version '1.0'
6+
version '1.2'
77

88
repositories {
99
mavenCentral()
@@ -22,7 +22,7 @@ tasks.withType(JavaCompile) {
2222
dependencies {
2323
implementation 'org.ow2.asm:asm:9.2'
2424
implementation 'org.ow2.asm:asm-tree:9.2'
25-
implementation 'com.github.Col-E:CAFED00D:1.8.1'
25+
implementation 'com.github.Col-E:CAFED00D:1.9.6'
2626
implementation 'org.slf4j:slf4j-api:1.7.35'
2727

2828
def junitVersion = '5.8.2'

src/main/java/dev/xdark/ssvm/mirror/InstanceJavaClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import dev.xdark.ssvm.util.UnsafeUtil;
77
import dev.xdark.ssvm.value.*;
88
import lombok.val;
9-
import me.coley.cafedude.ClassFile;
109
import me.coley.cafedude.InvalidClassException;
10+
import me.coley.cafedude.classfile.ClassFile;
1111
import me.coley.cafedude.io.ClassFileReader;
1212
import org.objectweb.asm.ClassReader;
1313
import org.objectweb.asm.Opcodes;

src/main/java/dev/xdark/ssvm/natives/ClassNatives.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
import dev.xdark.ssvm.value.*;
1414
import lombok.experimental.UtilityClass;
1515
import lombok.val;
16-
import me.coley.cafedude.ClassMember;
17-
import me.coley.cafedude.ConstPool;
1816
import me.coley.cafedude.Constants;
19-
import me.coley.cafedude.attribute.AnnotationDefaultAttribute;
20-
import me.coley.cafedude.attribute.AnnotationsAttribute;
21-
import me.coley.cafedude.attribute.Attribute;
22-
import me.coley.cafedude.attribute.ParameterAnnotationsAttribute;
17+
import me.coley.cafedude.classfile.ClassMember;
18+
import me.coley.cafedude.classfile.ConstPool;
19+
import me.coley.cafedude.classfile.attribute.AnnotationDefaultAttribute;
20+
import me.coley.cafedude.classfile.attribute.AnnotationsAttribute;
21+
import me.coley.cafedude.classfile.attribute.Attribute;
22+
import me.coley.cafedude.classfile.attribute.ParameterAnnotationsAttribute;
2323

2424
import java.util.List;
2525

src/main/java/dev/xdark/ssvm/natives/ConstantPoolNatives.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import dev.xdark.ssvm.value.*;
99
import lombok.experimental.UtilityClass;
1010
import lombok.val;
11-
import me.coley.cafedude.ClassFile;
12-
import me.coley.cafedude.constant.*;
11+
import me.coley.cafedude.classfile.ClassFile;
12+
import me.coley.cafedude.classfile.constant.*;
1313

1414
/**
1515
* Initializes xx/reflect/ConstantPool

src/main/java/dev/xdark/ssvm/natives/UnsafeNatives.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import dev.xdark.ssvm.value.*;
1212
import lombok.experimental.UtilityClass;
1313
import lombok.val;
14-
import me.coley.cafedude.constant.ConstPoolEntry;
15-
import me.coley.cafedude.constant.CpString;
16-
import me.coley.cafedude.constant.CpUtf8;
14+
import me.coley.cafedude.classfile.constant.ConstPoolEntry;
15+
import me.coley.cafedude.classfile.constant.CpString;
16+
import me.coley.cafedude.classfile.constant.CpUtf8;
1717
import org.objectweb.asm.Opcodes;
1818
import org.objectweb.asm.tree.LdcInsnNode;
1919

@@ -422,8 +422,8 @@ private static void init(VirtualMachine vm, InstanceJavaClass unsafe, UnsafeHelp
422422
.stream()
423423
.map(x -> x.instructions)
424424
.flatMap(x -> StreamSupport.stream(x.spliterator(), false))
425-
.filter(LdcInsnNode.class::isInstance)
426-
.map(LdcInsnNode.class::cast)
425+
.filter(x -> x instanceof LdcInsnNode)
426+
.map(x -> (LdcInsnNode) x)
427427
.filter(x -> x.cst instanceof String)
428428
.collect(Collectors.groupingBy(x -> (String) x.cst, Collectors.mapping(Function.identity(), Collectors.toList())));
429429
for (int i = 1; i < values.length; i++) {

src/main/java/dev/xdark/ssvm/natives/Util.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import dev.xdark.ssvm.value.*;
66
import lombok.experimental.UtilityClass;
77
import lombok.val;
8-
import me.coley.cafedude.attribute.AnnotationDefaultAttribute;
9-
import me.coley.cafedude.attribute.AnnotationsAttribute;
10-
import me.coley.cafedude.attribute.ParameterAnnotationsAttribute;
8+
import me.coley.cafedude.classfile.attribute.AnnotationDefaultAttribute;
9+
import me.coley.cafedude.classfile.attribute.AnnotationsAttribute;
10+
import me.coley.cafedude.classfile.attribute.ParameterAnnotationsAttribute;
1111
import me.coley.cafedude.io.AnnotationWriter;
1212
import org.objectweb.asm.Type;
1313

0 commit comments

Comments
 (0)