Skip to content

Commit 55c3e49

Browse files
committed
Update to ASM9 API
Supports records and sealed classes
1 parent 03e8507 commit 55c3e49

File tree

4 files changed

+11
-28
lines changed

4 files changed

+11
-28
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375
<dependency>
376376
<groupId>org.ow2.asm</groupId>
377377
<artifactId>asm</artifactId>
378-
<version>9.7</version>
378+
<version>9.7.1</version>
379379
</dependency>
380380
<dependency>
381381
<groupId>jline</groupId>

src/main/java/com/laytonsmith/PureUtilities/ClassLoading/ClassMirror/ClassMirrorVisitor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class ClassMirrorVisitor extends ClassVisitor {
2727
private final ClassMirror.ClassInfo<Object> classInfo;
2828

2929
ClassMirrorVisitor(ClassMirror.ClassInfo<Object> info) {
30-
super(Opcodes.ASM7);
30+
super(Opcodes.ASM9);
3131
this.classInfo = info;
3232
}
3333

@@ -126,7 +126,7 @@ public FieldVisitor visitField(int access, String name, String desc, String sign
126126
value,
127127
signature
128128
);
129-
return new FieldVisitor(Opcodes.ASM7, super.visitField(access, name, desc, signature, value)) {
129+
return new FieldVisitor(Opcodes.ASM9, super.visitField(access, name, desc, signature, value)) {
130130
@Override
131131
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
132132
final AnnotationMirror annotationMirror = new AnnotationMirror(new ClassReferenceMirror(desc), visible);
@@ -188,7 +188,7 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
188188
);
189189
}
190190

191-
return new MethodVisitor(Opcodes.ASM7, super.visitMethod(access, name, desc, signature, exceptions)) {
191+
return new MethodVisitor(Opcodes.ASM9, super.visitMethod(access, name, desc, signature, exceptions)) {
192192
@Override
193193
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
194194
final AnnotationMirror annotationMirror = new AnnotationMirror(new ClassReferenceMirror<>(desc), visible);
@@ -231,7 +231,7 @@ private static class AnnotationMirrorVisitor extends AnnotationVisitor {
231231
private final AnnotationMirror mirror;
232232

233233
public AnnotationMirrorVisitor(AnnotationVisitor next, AnnotationMirror mirror) {
234-
super(Opcodes.ASM7, next);
234+
super(Opcodes.ASM9, next);
235235
this.mirror = mirror;
236236
}
237237

@@ -258,7 +258,7 @@ private static class ArrayAnnotationVisitor extends AnnotationVisitor {
258258
private Class<?> type;
259259

260260
public ArrayAnnotationVisitor(String name, AnnotationMirror mirror) {
261-
super(Opcodes.ASM7);
261+
super(Opcodes.ASM9);
262262
this.name = name;
263263
this.mirror = mirror;
264264
}

src/main/java/com/laytonsmith/PureUtilities/Common/Annotations/CheckOverrides.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ private static void setup() {
342342
List<ClassMirror<?>> classes = ClassDiscovery.getDefaultInstance().getKnownClasses(ClassDiscovery.GetClassContainer(CheckOverrides.class));
343343
for(ClassMirror cm : classes) {
344344
Class c = cm.loadClass(CheckOverrides.class.getClassLoader(), false);
345-
if(c.isInterface()) {
345+
if(c.isInterface() || c.isRecord()) {
346346
continue;
347347
}
348348
Set<Method> mm = getPotentiallyOverridingMethods(c);

src/main/java/com/laytonsmith/abstraction/entities/MCDisplay.java

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ public interface MCDisplay extends MCEntity {
5757

5858
void setViewRange(float range);
5959

60-
public MCTransformation getTransformation();
60+
MCTransformation getTransformation();
6161

62-
public void setTransformation(MCTransformation transformation);
62+
void setTransformation(MCTransformation transformation);
6363

64-
public void setTransformationMatrix(float[] mtrxf);
64+
void setTransformationMatrix(float[] mtrxf);
6565

6666
enum Billboard {
6767
CENTER,
@@ -70,22 +70,5 @@ enum Billboard {
7070
VERTICAL
7171
}
7272

73-
class Brightness {
74-
75-
final int block;
76-
final int sky;
77-
78-
public Brightness(int block, int sky) {
79-
this.block = block;
80-
this.sky = sky;
81-
}
82-
83-
public int block() {
84-
return this.block;
85-
}
86-
87-
public int sky() {
88-
return this.sky;
89-
}
90-
}
73+
record Brightness(int block, int sky) {}
9174
}

0 commit comments

Comments
 (0)