From 0d7b1ff89a8fae3681941084cb2d7c988a86955a Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 22 Nov 2015 19:57:11 -0600
Subject: [PATCH] Add interface injector

---
 .../runelite/deob/runeloader/MappingImporter.java   | 13 +++++++++++++
 .../deob/runeloader/inject/InjectionModscript.java  |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/test/java/net/runelite/deob/runeloader/MappingImporter.java b/src/test/java/net/runelite/deob/runeloader/MappingImporter.java
index 9ffdaef8d2..0b8d72c35f 100644
--- a/src/test/java/net/runelite/deob/runeloader/MappingImporter.java
+++ b/src/test/java/net/runelite/deob/runeloader/MappingImporter.java
@@ -5,11 +5,13 @@ import java.io.IOException;
 import net.runelite.deob.ClassFile;
 import net.runelite.deob.ClassGroup;
 import net.runelite.deob.Field;
+import net.runelite.deob.Interfaces;
 import net.runelite.deob.attributes.Annotations;
 import net.runelite.deob.attributes.AttributeType;
 import net.runelite.deob.attributes.annotation.Annotation;
 import net.runelite.deob.attributes.annotation.Element;
 import net.runelite.deob.pool.UTF8;
+import net.runelite.deob.runeloader.inject.AddInterfaceInstruction;
 import net.runelite.deob.runeloader.inject.GetterInjectInstruction;
 import net.runelite.deob.runeloader.inject.InjectionModscript;
 import net.runelite.deob.signature.Type;
@@ -27,6 +29,7 @@ public class MappingImporter
 	
 	private static final Type OBFUSCATED_NAME = new Type("Lnet/runelite/mapping/ObfuscatedName;");
 	private static final Type EXPORT = new Type("Lnet/runelite/mapping/Export;");
+	private static final Type IMPLEMENTS = new Type("Lnet/runelite/mapping/Implements;");
 	
 	private ClassGroup group;
 	
@@ -116,5 +119,15 @@ public class MappingImporter
 			
 			f.getAttributes().addAnnotation(EXPORT, "value", new UTF8(attrName));
 		}
+		
+		for (AddInterfaceInstruction aii : mod.getAddInterfaceInjects())
+		{
+			ClassFile cf = this.findClassWithObfuscatedName(aii.getClientClass());
+			Assert.assertNotNull(cf);
+			
+			String iface = aii.getInterfaceClass();
+			
+			cf.getAttributes().addAnnotation(IMPLEMENTS, "value", new UTF8(iface));
+		}
 	}
 }
diff --git a/src/test/java/net/runelite/deob/runeloader/inject/InjectionModscript.java b/src/test/java/net/runelite/deob/runeloader/inject/InjectionModscript.java
index d805bfa17b..a428eb7c01 100644
--- a/src/test/java/net/runelite/deob/runeloader/inject/InjectionModscript.java
+++ b/src/test/java/net/runelite/deob/runeloader/inject/InjectionModscript.java
@@ -11,7 +11,7 @@ import org.objectweb.asm.tree.AbstractInsnNode;
 public class InjectionModscript {
    private List<GetterInjectInstruction> getterInjects = new LinkedList<>();
    private List superChangeInjects = new LinkedList();
-   private List addInterfaceInjects = new LinkedList();
+   private List<AddInterfaceInstruction> addInterfaceInjects = new LinkedList();
    private List methodMods = new LinkedList();
    private List addMethods = new LinkedList();
    private List newMethodMods = new LinkedList();
@@ -40,7 +40,7 @@ public class InjectionModscript {
       return this.superChangeInjects;
    }
 
-   public List getAddInterfaceInjects() {
+   public List<AddInterfaceInstruction> getAddInterfaceInjects() {
       return this.addInterfaceInjects;
    }