injector: add interfaces correctly

BossTuf · Dec 22, 2020 · de0773d · de0773d
1 parent 399549e
commit de0773d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,7 +36,7 @@ buildscript {
     dependencies {
         classpath("org.ajoberstar.grgit:grgit-core:4.1.0")
         classpath("com.github.ben-manes:gradle-versions-plugin:0.36.0")
-        classpath("com.openosrs:openosrs-injector:1.0.1")
+        classpath("com.openosrs:openosrs-injector:1.0.2")
     }
 }
 

diff --git a/deobfuscator/src/main/java/net/runelite/asm/Interfaces.java b/deobfuscator/src/main/java/net/runelite/asm/Interfaces.java
@@ -43,12 +43,15 @@ public class Interfaces implements Iterable<Class>
 		classFile = c;
 	}
 
-	public void addInterface(Class clazz)
+	public boolean addInterface(Class clazz)
 	{
-		if (!interfaces.contains(clazz))
+		if (interfaces.stream().noneMatch((itf) -> itf.getName().equals(clazz.getName())))
 		{
 			interfaces.add(clazz);
+			return true;
 		}
+
+		return false;
 	}
 
 	public List<Class> getInterfaces()

diff --git a/openosrs-injector/openosrs-injector.gradle.kts b/openosrs-injector/openosrs-injector.gradle.kts
@@ -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()

diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java
@@ -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 void inject()
 	@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 @@ private Map<Provider<ClassFile>, List<ClassFile>> initTargets()
 		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