ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

injector: add interfaces correctly

Browse Source
This commit is contained in:
ThatGamerBlue
2020-12-22 15:51:48 +00:00
parent 399549ec39
commit de0773d993
4 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openosrs-injector/openosrs-injector.gradle.kts
View File

@@ -15,10 +15,8 @@ plugins {
id("se.patrikerdes.use-latest-versions")
}
val oprsver = "3.5.1"
group = "com.openosrs"
version = "1.0.1"
version = "1.0.2"
repositories {
mavenCentral()

31
openosrs-injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java
View File

@@ -87,6 +87,7 @@ public class MixinInjector extends AbstractInjector
private static final String ASSERTION_FIELD = "$assertionsDisabled";
private static final String MIXIN_BASE = "net/runelite/mixins/";
private int injectedInterfaces = 0;
private final Map<String, Field> injectedFields = new HashMap<>();
private final Map<net.runelite.asm.pool.Field, ShadowField> shadowFields = new HashMap<>();
private int copied = 0, replaced = 0, injected = 0;
@@ -106,6 +107,13 @@ public class MixinInjector extends AbstractInjector
@VisibleForTesting
void inject(Map<Provider<ClassFile>, List<ClassFile>> mixinTargets)
{
for (Map.Entry<Provider<ClassFile>, List<ClassFile>> entry : mixinTargets.entrySet())
{
injectInterfaces(entry.getKey(), entry.getValue());
}
log.info("[INFO] Injected {} interfaces", injectedInterfaces);
for (Map.Entry<Provider<ClassFile>, List<ClassFile>> entry : mixinTargets.entrySet())
{
System.out.println(entry.getKey().get().getName());
@@ -157,6 +165,29 @@ public class MixinInjector extends AbstractInjector
return builder.build();
}
private void injectInterfaces(Provider<ClassFile> mixinProvider, List<ClassFile> targetClasses)
{
try
{
final ClassFile mixinClass = mixinProvider.get();
for (final ClassFile targetClass : targetClasses)
{
mixinClass.getInterfaces().getInterfaces().forEach((itf) ->
{
if (targetClass.getInterfaces().addInterface(itf))
{
injectedInterfaces++;
}
});
}
}
catch (Exception e)
{
e.printStackTrace();
}
}
private void injectFields(Provider<ClassFile> mixinProvider, List<ClassFile> targetClasses)
{
try