gradle: injected-client things

Move injector goal to injected-client(ish)
Keep injected-client classes in the correct package
Remove placeholder class/duplicate vanilla jar

injector-plugin/build.gradle

@@ -2,7 +2,6 @@ group = 'net.runelite.rs'
 description = 'Injector'
 
 def buildPath = buildDir.toString().replace('\\', '/') // this doesnt work in an ext block for some reason
-
 def deobfuscatedJar = "${rootPath}/runescape-client/build/libs/rs-client-${project.version}.jar"
 def vanillaJar = "${buildPath}/vanilla-${rsversion}.jar"
 
@@ -39,7 +38,7 @@ compileJava.doLast() {
         into "$buildDir"
     }
     def path = sourceSets.main.runtimeClasspath
-    def loader = new URLClassLoader(path.collect { f -> f.toURL() } as URL[])
+    def loader = new URLClassLoader(path.collect { f -> f.toURI().toURL() } as URL[])
     def inject = loader.loadClass('net.runelite.injector.Injector')
     String[] jarPaths = [
             deobfuscatedJar.toString(),

injector-plugin/src/main/java/net/runelite/injector/Injector.java

@@ -26,9 +26,6 @@ package net.runelite.injector;
 
 import java.io.File;
 import java.io.IOException;
-
-import com.google.common.io.Files;
-import net.runelite.asm.ClassFile;
 import net.runelite.asm.ClassGroup;
 import net.runelite.deob.util.JarUtil;
 
@@ -72,13 +69,7 @@ public class Injector
 
 	private void save(File out) throws IOException
 	{
-		out.mkdirs();
-		for (ClassFile cf : vanilla.getClasses())
-		{
-			File f = new File(out, cf.getClassName() + ".class");
-			byte[] data = JarUtil.writeClass(vanilla, cf);
-			Files.write(data, f);
-		}
+		JarUtil.saveJar(vanilla, out);
 	}