"finish" injector module, more robust injected-client loading (open-o…

…srs#2881)

"finish" injector module, more robust injected-client loading

build.gradle.kts

@@ -36,7 +36,6 @@ 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.2")
     }
 }
 

buildSrc/src/main/kotlin/BootstrapPlugin.kt

@@ -14,7 +14,7 @@ class BootstrapPlugin : Plugin<Project> {
             bootstrapDependencies(project(":runelite-api"))
             bootstrapDependencies(project(":runescape-api"))
             bootstrapDependencies(project(":http-api"))
-            bootstrapDependencies(project(":injected-client"))
+            bootstrapDependencies(project(":injector"))
             bootstrapDependencies(project(":runelite-client"))
         }
 
@@ -31,7 +31,7 @@ class BootstrapPlugin : Plugin<Project> {
             dependsOn(project(":runelite-api").tasks["publish"])
             dependsOn(project(":runescape-api").tasks["publish"])
             dependsOn(project(":http-api").tasks["publish"])
-            dependsOn(project(":injected-client").tasks["publish"])
+            dependsOn(project(":injector").tasks["publish"])
 
             doLast {
                 copy {
@@ -41,7 +41,7 @@ class BootstrapPlugin : Plugin<Project> {
                 copy {
                     from(
                             "${buildDir}/repo/.",
-                            "${parent?.projectDir}/injected-client/build/repo/.",
+                            "${parent?.projectDir}/injector/build/repo/.",
                             "${parent?.projectDir}/runelite-api/build/repo/.",
                             "${parent?.projectDir}/http-api/build/repo/.",
                             "${parent?.projectDir}/runescape-api/build/repo/."

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

injector/injector.gradle.kts

@@ -0,0 +1,44 @@
+import ProjectVersions.rsversion
+
+group = "com.openosrs"
+version = 1.0
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+    maven {
+        url = uri("https://repo.runelite.net")
+        url = uri("https://raw.githubusercontent.com/open-osrs/hosting/master")
+        url = uri("https://repo.openosrs.com/repository/maven")
+    }
+}
+
+plugins {
+    java
+}
+
+dependencies {
+    implementation(gradleApi())
+    annotationProcessor("org.projectlombok:lombok:1.18.12")
+    compileOnly("org.projectlombok:lombok:1.18.12")
+
+    implementation("org.ow2.asm:asm:8.0.1")
+    implementation("org.ow2.asm:asm-util:8.0.1")
+    implementation("org.jetbrains:annotations:19.0.0")
+    implementation("com.google.guava:guava:29.0-jre")
+    implementation(project(":deobfuscator"))
+    implementation(project(":runescape-api"))
+    implementation(project(":runescape-client"))
+    implementation(project(":runelite-mixins"))
+}
+
+tasks.register<JavaExec>("inject") {
+    main = "com.openosrs.injector.Injector"
+    classpath = sourceSets["main"].runtimeClasspath
+}
+
+tasks {
+    build {
+        finalizedBy("inject")
+    }
+}

openosrs-injector/src/main/java/com/openosrs/injector/Injection.java → injector/src/main/java/com/openosrs/injector/Injector.java

@@ -11,7 +11,6 @@
 import com.openosrs.injector.injection.InjectTaskHandler;
 import com.openosrs.injector.injectors.CreateAnnotations;
 import com.openosrs.injector.injectors.InjectConstruct;
-import com.openosrs.injector.injectors.Injector;
 import com.openosrs.injector.injectors.InterfaceInjector;
 import com.openosrs.injector.injectors.MixinInjector;
 import com.openosrs.injector.injectors.RSApiInjector;
@@ -28,22 +27,43 @@
 import java.io.File;
 import java.io.IOException;
 import net.runelite.deob.util.JarUtil;
-import org.gradle.api.file.FileTree;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
 
-public class Injection extends InjectData implements InjectTaskHandler
+public class Injector extends InjectData implements InjectTaskHandler
 {
-	private static final Logger log = Logging.getLogger(Injection.class);
+	private static final Logger log = Logging.getLogger(Injector.class);
 
-	public Injection(File vanilla, File rsclient, File mixins, FileTree rsapi) throws IOException
+	public Injector(File vanilla, File rsclient, File mixins, File[] rsapi) throws IOException
 	{
 		super(
 			JarUtil.loadJar(vanilla),
 			JarUtil.loadJar(rsclient),
 			JarUtil.loadJar(mixins),
 			new RSApi(rsapi)
 		);
+		inject();
+		save(new File("../runelite-client/src/main/resources/net/runelite/client/injected-client.jar"));
+	}
+
+	public static void main(String[] args)
+	{
+		try
+		{
+			args = new String[]
+				{
+					"./vanilla.jar",
+					"../runescape-client/build/libs/runescape-client-3.5.4.jar",
+					"../runelite-mixins/build/libs/runelite-mixins-3.5.4.jar",
+					"../runescape-api/build/classes/java/main/net/runelite/rs/api/"
+				};
+			new Injector(new File(args[0]), new File(args[1]), new File(args[2]), new File(args[3]).listFiles());
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
+
 	}
 
 	public void inject()
@@ -93,7 +113,7 @@ public void save(File outputJar) throws IOException
 		JarUtil.saveJar(this.getVanilla(), outputJar);
 	}
 
-	private void inject(Injector injector)
+	private void inject(com.openosrs.injector.injectors.Injector injector)
 	{
 		final String name = injector.getName();
 
@@ -132,7 +152,7 @@ private void transform(InjectTransformer transformer)
 		log.lifecycle("{} {}", name, transformer.getCompletionMsg());
 	}
 
-	public void runChildInjector(Injector injector)
+	public void runChildInjector(com.openosrs.injector.injectors.Injector injector)
 	{
 		inject(injector);
 	}

openosrs-injector/src/main/java/com/openosrs/injector/InjectorValidator.java → injector/src/main/java/com/openosrs/injector/InjectorValidator.java

@@ -69,7 +69,7 @@ private void check(ClassFile clazz, RSApiClass apiClass)
 
 			if (clazz.findMethodDeep(apiMethod.getName(), apiMethod.getSignature()) == null)
 			{
-				log.warn("[WARN] Class {} implements interface {} but doesn't implement {}",
+				log.error("[WARN] Class {} implements interface {} but doesn't implement {}",
 					clazz.getPoolClass(), apiClass.getClazz(), apiMethod.getMethod());
 				++missing;
 			}

openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectData.java → injector/src/main/java/com/openosrs/injector/injection/InjectData.java

@@ -23,7 +23,7 @@
 import net.runelite.asm.signature.Signature;
 
 /**
- * Abstract class meant as the interface of {@link com.openosrs.injector.Injection injection} for injectors
+ * Abstract class meant as the interface of {@link com.openosrs.injector.Injector injection} for injectors
  */
 public abstract class InjectData
 {
@@ -96,6 +96,7 @@ private Map<ClassFile, ClassFile> initToVanilla()
 	 */
 	public ClassFile toVanilla(ClassFile deobClass)
 	{
+
 		return toVanilla.get(deobClass);
 	}
 

openosrs-injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java → injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java

@@ -43,7 +43,7 @@ private void injectInterface(final ClassFile deobCf, final ClassFile vanillaCf)
 		final String fullName = API_BASE + impls;
 		if (!inject.getRsApi().hasClass(fullName))
 		{
-			log.debug("[DEBUG] Class {} implements nonexistent interface {}, skipping interface injection",
+			log.error("[DEBUG] Class {} implements nonexistent interface {}, skipping interface injection",
 				deobCf.getName(),
 				fullName
 			);
@@ -52,6 +52,7 @@ private void injectInterface(final ClassFile deobCf, final ClassFile vanillaCf)
 		}
 
 		final Interfaces interfaces = vanillaCf.getInterfaces();
+		System.out.println(fullName);
 		interfaces.addInterface(new Class(fullName));
 		implemented++;
 

openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java → injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java

@@ -40,7 +40,7 @@ public class RSApi implements Iterable<RSApiClass>
 
 	private ImmutableMap<String, RSApiClass> map;
 
-	public RSApi(FileTree classes)
+	public RSApi(File[] classes)
 	{
 		for (File file : classes)
 		{