mirror/plugin-hub
1
0
Fork 0
mirror of https://github.com/runelite/plugin-hub.git synced 2026-02-18 15:10:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

package: allow newer class files than asm supports in multirelease jars

Browse Source
This commit is contained in:
Max Weber
2022-06-15 19:40:14 -06:00
parent e654241ab8
commit 2627286f6c
1 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
package/package/src/main/java/net/runelite/pluginhub/packager/Plugin.java
View File

@@ -604,41 +604,56 @@ public class Plugin implements Closeable
continue;
}
boolean isMultiRelease = fileName.startsWith("META-INF/versions");
byte[] classData = ByteStreams.toByteArray(jis);
new ClassReader(classData).accept(new ClassVisitor(Opcodes.ASM7, builtinApi)
try
{
boolean extendsPlugin;
String name;
@SneakyThrows
@Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces)
new ClassReader(classData).accept(new ClassVisitor(Opcodes.ASM7, builtinApi)
{
if ((version & 0xFFFF) > Opcodes.V1_8
&& !(fileName.startsWith("META-INF/versions") || fileName.endsWith("module-info.class")))
boolean extendsPlugin;
String name;
@SneakyThrows
@Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces)
{
throw PluginBuildException.of(Plugin.this, "plugins must be Java 1.8 compatible")
.withFile(fileName);
if ((version & 0xFFFF) > Opcodes.V1_8
&& !(isMultiRelease || fileName.endsWith("module-info.class")))
{
throw PluginBuildException.of(Plugin.this, "plugins must be Java 1.8 compatible")
.withFile(fileName);
}
jarClasses.add(name.replace('/', '.'));
extendsPlugin = "net/runelite/client/plugins/Plugin".equals(superName);
this.name = name;
super.visit(version, access, name, signature, superName, interfaces);
}
jarClasses.add(name.replace('/', '.'));
extendsPlugin = "net/runelite/client/plugins/Plugin".equals(superName);
this.name = name;
super.visit(version, access, name, signature, superName, interfaces);
}
@Override
public AnnotationVisitor visitAnnotation(String descriptor, boolean visible)
{
if ("Lnet/runelite/client/plugins/PluginDescriptor;".equals(descriptor) && extendsPlugin)
@Override
public AnnotationVisitor visitAnnotation(String descriptor, boolean visible)
{
pluginClasses.add(name.replace('/', '.'));
}
if ("Lnet/runelite/client/plugins/PluginDescriptor;".equals(descriptor) && extendsPlugin)
{
pluginClasses.add(name.replace('/', '.'));
}
return null;
return null;
}
}, ClassReader.SKIP_CODE);
}
catch (IllegalArgumentException e)
{
if (isMultiRelease)
{
// allow multirelease classes to not be parsable by asm, they may be too new
return;
}
}, ClassReader.SKIP_CODE);
throw e;
}
}
}