diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java index 17041f6129..9d3804ebab 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java @@ -26,15 +26,14 @@ package net.runelite.client.rs; import com.google.common.annotations.VisibleForTesting; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; - -import javax.inject.Inject; -import javax.inject.Singleton; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import javax.inject.Inject; +import javax.inject.Singleton; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; @Singleton class ClientConfigLoader @@ -52,13 +51,13 @@ class ClientConfigLoader RSConfig fetch() throws IOException { final Request request = new Request.Builder() - .url(CONFIG_URL) - .build(); + .url(CONFIG_URL) + .build(); final RSConfig config = new RSConfig(); try (final Response response = httpClient.newCall(request).execute(); final BufferedReader in = new BufferedReader( - new InputStreamReader(response.body().byteStream()))) + new InputStreamReader(response.body().byteStream()))) { String str; diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index ed1fa46452..9c70435b0b 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -32,24 +32,18 @@ import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import io.sigpipe.jbsdiff.InvalidHeaderException; import io.sigpipe.jbsdiff.Patch; -import javassist.ClassPool; -import javassist.NotFoundException; -import lombok.extern.slf4j.Slf4j; -import net.runelite.client.RuneLite; -import net.runelite.client.rs.bytecode.ByteCodePatcher; -import net.runelite.client.rs.bytecode.ByteCodeUtils; -import net.runelite.client.rs.bytecode.Hooks; -import net.runelite.http.api.RuneLiteAPI; -import okhttp3.Request; -import okhttp3.Response; -import org.apache.commons.compress.compressors.CompressorException; -import org.xeustechnologies.jcl.JarClassLoader; - -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.applet.Applet; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.lang.reflect.Field; import java.net.URL; import java.net.URLClassLoader; @@ -59,38 +53,293 @@ import java.security.cert.CertificateFactory; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.jar.*; +import java.util.jar.Attributes; +import java.util.jar.JarEntry; +import java.util.jar.JarInputStream; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; import java.util.logging.Logger; +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; -import static net.runelite.client.rs.ClientUpdateCheckMode.*; +import javassist.ClassPool; +import javassist.NotFoundException; +import lombok.extern.slf4j.Slf4j; +import static net.runelite.client.rs.ClientUpdateCheckMode.AUTO; +import static net.runelite.client.rs.ClientUpdateCheckMode.NONE; +import static net.runelite.client.rs.ClientUpdateCheckMode.VANILLA; + +import net.runelite.client.RuneLite; +import net.runelite.client.rs.bytecode.ByteCodeUtils; +import net.runelite.client.rs.bytecode.ByteCodePatcher; +import net.runelite.client.rs.bytecode.Hooks; +import net.runelite.http.api.RuneLiteAPI; +import okhttp3.Request; +import okhttp3.Response; +import org.apache.commons.compress.compressors.CompressorException; +import org.xeustechnologies.jcl.JarClassLoader; @Slf4j @Singleton -public class ClientLoader { - public static File hooksFile = new File(RuneLite.RUNELITE_DIR + "/hooks-" + RuneLiteAPI.getVersion() + "-.json"); - private final ClientConfigLoader clientConfigLoader; - private ClientUpdateCheckMode updateCheckMode; - private JarOutputStream target; +public class ClientLoader +{ + public static File hooksFile = new File(RuneLite.RUNELITE_DIR+"/hooks-"+ RuneLiteAPI.getVersion() +"-.json"); + private final ClientConfigLoader clientConfigLoader; + private ClientUpdateCheckMode updateCheckMode; + private JarOutputStream target; - @Inject - private ClientLoader( - @Named("updateCheckMode") final ClientUpdateCheckMode updateCheckMode, - final ClientConfigLoader clientConfigLoader) { - this.updateCheckMode = updateCheckMode; - this.clientConfigLoader = clientConfigLoader; - } + @Inject + private ClientLoader( + @Named("updateCheckMode") final ClientUpdateCheckMode updateCheckMode, + final ClientConfigLoader clientConfigLoader) + { + this.updateCheckMode = updateCheckMode; + this.clientConfigLoader = clientConfigLoader; + } - private static Certificate[] getJagexCertificateChain() throws CertificateException { - CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509"); - Collection certificates = certificateFactory.generateCertificates(ClientLoader.class.getResourceAsStream("jagex.crt")); - return certificates.toArray(new Certificate[certificates.size()]); - } + public Applet load() + { + if (updateCheckMode == NONE) + { + return null; + } + + try + { + File injectedClientFile = ByteCodeUtils.injectedClientFile; + File hijackedClientFile = ByteCodeUtils.hijackedClientFile; + Manifest manifest = new Manifest(); + manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0"); + target = new JarOutputStream(new FileOutputStream(injectedClientFile), manifest); + RSConfig config = clientConfigLoader.fetch(); + + Map zipFile = new HashMap<>(); + { + Certificate[] jagexCertificateChain = getJagexCertificateChain(); + String codebase = config.getCodeBase(); + String initialJar = config.getInitialJar(); + URL url = new URL(codebase + initialJar); + Request request = new Request.Builder() + .url(url) + .build(); + + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + { + JarInputStream jis; + + jis = new JarInputStream(response.body().byteStream()); + + byte[] tmp = new byte[4096]; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024); + for (; ; ) + { + JarEntry metadata = jis.getNextJarEntry(); + if (metadata == null) + { + break; + } + + buffer.reset(); + for (; ; ) + { + int n = jis.read(tmp); + if (n <= -1) + { + break; + } + buffer.write(tmp, 0, n); + } + + zipFile.put(metadata.getName(), buffer.toByteArray()); + } + } + } + + if (updateCheckMode == AUTO) + { + Map hashes; + try (InputStream is = ClientLoader.class.getResourceAsStream("/patch/hashes.json")) + { + hashes = new Gson().fromJson(new InputStreamReader(is), new TypeToken>() + { + }.getType()); + } + + for (Map.Entry file : hashes.entrySet()) + { + byte[] bytes = zipFile.get(file.getKey()); + + String ourHash = null; + if (bytes != null) + { + ourHash = Hashing.sha512().hashBytes(bytes).toString(); + } + + if (!file.getValue().equals(ourHash)) + { + if (hijackedClientFile.exists()) { + Logger.getAnonymousLogger().warning("[RuneLit] Hash checking / Client patching skipped due to hijacked client."); + updateCheckMode = VANILLA; + break; + } else { + log.info("{} had a hash mismatch; falling back to vanilla. {} != {}", file.getKey(), file.getValue(), ourHash); + log.info("Client is outdated!"); + updateCheckMode = VANILLA; + break; + } + } + } + } + + if (updateCheckMode == AUTO) + { + ByteArrayOutputStream patchOs = new ByteArrayOutputStream(756 * 1024); + int patchCount = 0; + + for (Map.Entry file : zipFile.entrySet()) + { + byte[] bytes; + try (InputStream is = ClientLoader.class.getResourceAsStream("/patch/" + file.getKey() + ".bs")) + { + if (is == null) + { + continue; + } + + bytes = ByteStreams.toByteArray(is); + } + + patchOs.reset(); + Patch.patch(file.getValue(), bytes, patchOs); + file.setValue(patchOs.toByteArray()); + + ++patchCount; + + if (!file.getKey().startsWith("META")) { + add(file.getValue(), file.getKey(), target); + } + } + if (target!=null) + target.close(); + + log.info("Patched {} classes", patchCount); + } + if (hooksFile.exists()) { + ByteCodePatcher.classPool = new ClassPool(true); + ByteCodePatcher.classPool.appendClassPath(RuneLite.RUNELITE_DIR+"/injectedClient-"+ RuneLiteAPI.getVersion() +"-.jar"); + Gson gson = new Gson(); + Hooks hooks = gson.fromJson(new BufferedReader(new FileReader(hooksFile)), Hooks.class); + + if (hooks.clientInstance.equals("")|| + hooks.projectileClass.equals("") || + hooks.actorClass.equals("") || + hooks.playerClass.equals("")) { + System.out.println("[RuneLit] Bad hooks, re-scraping."); + ByteCodePatcher.clientInstance = getClientInstance(ByteCodeUtils.injectedClientFile.getPath()); + ByteCodePatcher.findHooks(injectedClientFile.getPath()); + } else { + ByteCodePatcher.clientInstance = hooks.clientInstance; + ByteCodePatcher.applyHooks(ByteCodeUtils.injectedClientFile, hooks); + System.out.println("[RuneLit] Loaded hooks"); + } + + } else { + System.out.println("[RuneLit] Hooks file not found, scraping hooks."); + ByteCodePatcher.clientInstance = getClientInstance(ByteCodeUtils.injectedClientFile.getPath()); + ByteCodePatcher.findHooks(injectedClientFile.getPath()); + } + + Map zipFile2 = new HashMap<>(); + JarInputStream jis = new JarInputStream(new FileInputStream(hijackedClientFile)); + + byte[] tmp = new byte[4096]; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024); + for (; ; ) { + JarEntry metadata = jis.getNextJarEntry(); + if (metadata == null) { + break; + } + + buffer.reset(); + for (; ; ) { + int n = jis.read(tmp); + if (n <= -1) { + break; + } + buffer.write(tmp, 0, n); + } + + zipFile2.put(metadata.getName(), buffer.toByteArray()); + } + + String initialClass = config.getInitialClass(); + + ClassLoader rsClassLoader = new ClassLoader(ClientLoader.class.getClassLoader()) + { + @Override + protected Class findClass(String name) throws ClassNotFoundException + { + String path = name.replace('.', '/').concat(".class"); + byte[] data = zipFile2.get(path); + if (data == null) + { + throw new ClassNotFoundException(name); + } + + return defineClass(name, data, 0, data.length); + } + }; + + Class clientClass = rsClassLoader.loadClass(initialClass); + + Applet rs = (Applet) clientClass.newInstance(); + rs.setStub(new RSAppletStub(config)); + return rs; + } + catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException + | CompressorException | InvalidHeaderException | CertificateException | SecurityException e) + { + if (e instanceof ClassNotFoundException) + { + log.error("Unable to load client - class not found. This means you" + + " are not running RuneLite with Maven as the client patch" + + " is not in your classpath."); + } + + log.error("Error loading RS!", e); + return null; + } catch (NotFoundException e) { + e.printStackTrace(); + } + return null; + } + + private void add(byte[] bytes, String entryName ,JarOutputStream target) throws IOException { + BufferedInputStream in = null; + try { + JarEntry entry = new JarEntry(entryName); + target.putNextEntry(entry); + target.write(bytes); + target.closeEntry(); + } finally { + if (in != null) + in.close(); + } + } + + private static Certificate[] getJagexCertificateChain() throws CertificateException + { + CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509"); + Collection certificates = certificateFactory.generateCertificates(ClientLoader.class.getResourceAsStream("jagex.crt")); + return certificates.toArray(new Certificate[certificates.size()]); + } public static String getClientInstance(String jarFile) { JarClassLoader jcl = new JarClassLoader(); try { ClassPool classPool = new ClassPool(true); - classPool.appendClassPath(RuneLite.RUNELITE_DIR + "/injectedClient-" + RuneLiteAPI.getVersion() + "-.jar"); + classPool.appendClassPath(RuneLite.RUNELITE_DIR+"/injectedClient-"+ RuneLiteAPI.getVersion() +"-.jar"); } catch (NotFoundException e) { e.printStackTrace(); } @@ -105,7 +354,7 @@ public class ClientLoader { ClassLoader cl = ClassLoader.getSystemClassLoader(); try { URLClassLoader child = new URLClassLoader( - new URL[]{temp.toURI().toURL()}, + new URL[] {temp.toURI().toURL()}, cl ); try { @@ -116,10 +365,10 @@ public class ClientLoader { Field[] fields = classToLoad.getDeclaredFields(); for (Field f : fields) { try { - if (f.getType().getName() == "client") { - ByteCodePatcher.hooks.clientInstance = classToLoad.getName() + "." + f.getName(); - System.out.println("[RuneLit] Found client instance at " + classToLoad.getName() + "." + f.getName()); - return classToLoad.getName() + "." + f.getName(); + if (f.getType().getName()=="client") { + ByteCodePatcher.hooks.clientInstance = classToLoad.getName()+"."+f.getName(); + System.out.println("[RuneLit] Found client instance at "+classToLoad.getName()+"."+f.getName()); + return classToLoad.getName()+"."+f.getName(); } } catch (Exception e) { e.printStackTrace(); @@ -134,7 +383,7 @@ public class ClientLoader { } catch (Exception e) { e.printStackTrace(); - System.out.println("Class not found: " + entry.getName()); + System.out.println("Class not found: "+entry.getName()); } } } @@ -144,210 +393,4 @@ public class ClientLoader { } return ""; } - - public Applet load() { - if (updateCheckMode == NONE) { - return null; - } - - try { - File injectedClientFile = ByteCodeUtils.injectedClientFile; - File hijackedClientFile = ByteCodeUtils.hijackedClientFile; - Manifest manifest = new Manifest(); - manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0"); - target = new JarOutputStream(new FileOutputStream(injectedClientFile), manifest); - RSConfig config = clientConfigLoader.fetch(); - - Map zipFile = new HashMap<>(); - { - Certificate[] jagexCertificateChain = getJagexCertificateChain(); - String codebase = config.getCodeBase(); - String initialJar = config.getInitialJar(); - URL url = new URL(codebase + initialJar); - Request request = new Request.Builder() - .url(url) - .build(); - - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { - JarInputStream jis; - - jis = new JarInputStream(response.body().byteStream()); - - byte[] tmp = new byte[4096]; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024); - for (; ; ) { - JarEntry metadata = jis.getNextJarEntry(); - if (metadata == null) { - break; - } - - buffer.reset(); - for (; ; ) { - int n = jis.read(tmp); - if (n <= -1) { - break; - } - buffer.write(tmp, 0, n); - } - - zipFile.put(metadata.getName(), buffer.toByteArray()); - } - } - } - - if (updateCheckMode == AUTO) { - Map hashes; - try (InputStream is = ClientLoader.class.getResourceAsStream("/patch/hashes.json")) { - hashes = new Gson().fromJson(new InputStreamReader(is), new TypeToken>() { - }.getType()); - } - - for (Map.Entry file : hashes.entrySet()) { - byte[] bytes = zipFile.get(file.getKey()); - - String ourHash = null; - if (bytes != null) { - ourHash = Hashing.sha512().hashBytes(bytes).toString(); - } - - if (!file.getValue().equals(ourHash)) { - if (hijackedClientFile.exists()) { - Logger.getAnonymousLogger().warning("[RuneLit] Hash checking / Client patching skipped due to hijacked client."); - updateCheckMode = VANILLA; - break; - } else { - log.info("{} had a hash mismatch; falling back to vanilla. {} != {}", file.getKey(), file.getValue(), ourHash); - log.info("Client is outdated!"); - updateCheckMode = VANILLA; - break; - } - } - } - } - - if (updateCheckMode == AUTO) { - ByteArrayOutputStream patchOs = new ByteArrayOutputStream(756 * 1024); - int patchCount = 0; - - for (Map.Entry file : zipFile.entrySet()) { - byte[] bytes; - try (InputStream is = ClientLoader.class.getResourceAsStream("/patch/" + file.getKey() + ".bs")) { - if (is == null) { - continue; - } - - bytes = ByteStreams.toByteArray(is); - } - - patchOs.reset(); - Patch.patch(file.getValue(), bytes, patchOs); - file.setValue(patchOs.toByteArray()); - - ++patchCount; - - if (!file.getKey().startsWith("META")) { - add(file.getValue(), file.getKey(), target); - } - } - if (target != null) - target.close(); - - log.info("Patched {} classes", patchCount); - } - if (hooksFile.exists()) { - ByteCodePatcher.classPool = new ClassPool(true); - ByteCodePatcher.classPool.appendClassPath(RuneLite.RUNELITE_DIR + "/injectedClient-" + RuneLiteAPI.getVersion() + "-.jar"); - Gson gson = new Gson(); - Hooks hooks = gson.fromJson(new BufferedReader(new FileReader(hooksFile)), Hooks.class); - if (hooks.clientInstance.equals("") || - hooks.projectileClass.equals("") || - hooks.actorClass.equals("") || - hooks.mainClientInstance.equals("") || - hooks.playerClass.equals("")) { - System.out.println("[RuneLit] Bad hooks, re-scraping."); - ByteCodePatcher.clientInstance = getClientInstance(ByteCodeUtils.injectedClientFile.getPath()); - ByteCodePatcher.findHooks(injectedClientFile.getPath()); - } else { - ByteCodePatcher.clientInstance = hooks.clientInstance; - ByteCodePatcher.applyHooks(ByteCodeUtils.injectedClientFile, hooks); - System.out.println("[RuneLit] Loaded hooks"); - } - - } else { - System.out.println("[RuneLit] Hooks file not found, scraping hooks."); - ByteCodePatcher.clientInstance = getClientInstance(ByteCodeUtils.injectedClientFile.getPath()); - ByteCodePatcher.findHooks(injectedClientFile.getPath()); - } - - Map zipFile2 = new HashMap<>(); - JarInputStream jis = new JarInputStream(new FileInputStream(hijackedClientFile)); - - byte[] tmp = new byte[4096]; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024); - for (; ; ) { - JarEntry metadata = jis.getNextJarEntry(); - if (metadata == null) { - break; - } - - buffer.reset(); - for (; ; ) { - int n = jis.read(tmp); - if (n <= -1) { - break; - } - buffer.write(tmp, 0, n); - } - - zipFile2.put(metadata.getName(), buffer.toByteArray()); - } - - String initialClass = config.getInitialClass(); - - ClassLoader rsClassLoader = new ClassLoader(ClientLoader.class.getClassLoader()) { - @Override - protected Class findClass(String name) throws ClassNotFoundException { - String path = name.replace('.', '/').concat(".class"); - byte[] data = zipFile2.get(path); - if (data == null) { - throw new ClassNotFoundException(name); - } - - return defineClass(name, data, 0, data.length); - } - }; - - Class clientClass = rsClassLoader.loadClass(initialClass); - - Applet rs = (Applet) clientClass.newInstance(); - rs.setStub(new RSAppletStub(config)); - return rs; - } catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException - | CompressorException | InvalidHeaderException | CertificateException | SecurityException e) { - if (e instanceof ClassNotFoundException) { - log.error("Unable to load client - class not found. This means you" - + " are not running RuneLite with Maven as the client patch" - + " is not in your classpath."); - } - - log.error("Error loading RS!", e); - return null; - } catch (NotFoundException e) { - e.printStackTrace(); - } - return null; - } - - private void add(byte[] bytes, String entryName, JarOutputStream target) throws IOException { - BufferedInputStream in = null; - try { - JarEntry entry = new JarEntry(entryName); - target.putNextEntry(entry); - target.write(bytes); - target.closeEntry(); - } finally { - if (in != null) - in.close(); - } - } } diff --git a/runelite-client/src/main/java/net/runelite/client/rs/RSAppletStub.java b/runelite-client/src/main/java/net/runelite/client/rs/RSAppletStub.java index 04a046b94e..a3a2a0f14a 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/RSAppletStub.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/RSAppletStub.java @@ -25,12 +25,11 @@ */ package net.runelite.client.rs; -import lombok.RequiredArgsConstructor; - import java.applet.AppletContext; import java.applet.AppletStub; import java.net.MalformedURLException; import java.net.URL; +import lombok.RequiredArgsConstructor; @RequiredArgsConstructor class RSAppletStub implements AppletStub diff --git a/runelite-client/src/main/java/net/runelite/client/rs/RSConfig.java b/runelite-client/src/main/java/net/runelite/client/rs/RSConfig.java index 3dc50d18e5..e0c5539323 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/RSConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/RSConfig.java @@ -25,10 +25,9 @@ */ package net.runelite.client.rs; -import lombok.Getter; - import java.util.HashMap; import java.util.Map; +import lombok.Getter; @Getter class RSConfig diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodePatcher.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodePatcher.java index 555d47a970..b75a8c9631 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodePatcher.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodePatcher.java @@ -10,12 +10,20 @@ import net.runelite.client.rs.ClientLoader; import net.runelite.client.rs.bytecode.transformers.ActorTransform; import net.runelite.client.rs.bytecode.transformers.PlayerTransform; import net.runelite.client.rs.bytecode.transformers.ProjectileTransform; -import net.runelite.client.rs.bytecode.transformers.getProjectileTransform; import net.runelite.http.api.RuneLiteAPI; import org.xeustechnologies.jcl.JarClassLoader; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; @@ -35,7 +43,7 @@ public class ByteCodePatcher { public static void applyHooks(File jf, Hooks hooks) { try { URLClassLoader child = new URLClassLoader( - new URL[]{jf.toURI().toURL()}, + new URL[] {jf.toURI().toURL()}, cl ); try { @@ -43,11 +51,8 @@ public class ByteCodePatcher { transformActor(actorClass); Class projectileClass = Class.forName(hooks.projectileClass, false, child); transformProjectile(projectileClass); - Class getProjectileClass = Class.forName(hooks.mainClientInstance, false, child); - transformGetProjectile(getProjectileClass); Class playerClass = Class.forName(hooks.playerClass, false, child); transformPlayer(playerClass); - ByteCodeUtils.updateHijackedJar(); } catch (Exception e) { e.printStackTrace(); @@ -61,7 +66,7 @@ public class ByteCodePatcher { public static void findHooks(String jf) { try { classPool = new ClassPool(true); - classPool.appendClassPath(RuneLite.RUNELITE_DIR + "/injectedClient-" + RuneLiteAPI.getVersion() + "-.jar"); + classPool.appendClassPath(RuneLite.RUNELITE_DIR+"/injectedClient-"+ RuneLiteAPI.getVersion() +"-.jar"); } catch (NotFoundException e) { e.printStackTrace(); } @@ -94,31 +99,30 @@ public class ByteCodePatcher { public static void checkClasses(File jf, JarEntry entry) { try { URLClassLoader child = new URLClassLoader( - new URL[]{jf.toURI().toURL()}, + new URL[] {jf.toURI().toURL()}, cl ); try { Class classToLoad = Class.forName(entry.getName().replace(".class", ""), false, child); checkActor(classToLoad); checkProjectile(classToLoad); - checkgetProjectiles(classToLoad); checkPlayer(classToLoad); } catch (Exception e) { - e.printStackTrace(); + e.printStackTrace(); } } catch (Exception e) { e.printStackTrace(); - System.out.println("Class not found: " + entry.getName()); + System.out.println("Class not found: "+entry.getName()); } } public static void checkActor(Class current) { try { - Method method = current.getDeclaredMethod("setCombatInfo", int.class, int.class, int.class, int.class, int.class, int.class); - if (method != null) { + Method method = current.getDeclaredMethod("setCombatInfo", new Class[] { int.class, int.class, int.class, int.class, int.class, int.class }); + if (method!=null) { hooks.actorClass = current.getName(); - System.out.println("[Z-lyte] Transforming Actor at class: " + current.getName()); + System.out.println("[RuneLit] Transforming Actor at class: "+current.getName()); ActorTransform at = new ActorTransform(); at.modify(current); } @@ -130,17 +134,17 @@ public class ByteCodePatcher { } public static void transformActor(Class actor) { - System.out.println("[RuneLit] Transforming Actor at class: " + actor.getName()); + System.out.println("[RuneLit] Transforming Actor at class: "+actor.getName()); ActorTransform at = new ActorTransform(); at.modify(actor); } public static void checkProjectile(Class current) { try { - Method method = current.getDeclaredMethod("projectileMoved", int.class, int.class, int.class, int.class); - if (method != null) { + Method method = current.getDeclaredMethod("projectileMoved", new Class[] { int.class, int.class, int.class, int.class}); + if (method!=null) { hooks.projectileClass = current.getName(); - System.out.println("[RuneLit] Transforming Projectile at class: " + current.getName()); + System.out.println("[RuneLit] Transforming Projectile at class: "+current.getName()); ProjectileTransform pt = new ProjectileTransform(); pt.modify(current); } @@ -152,39 +156,17 @@ public class ByteCodePatcher { } public static void transformProjectile(Class projectile) { - System.out.println("[RuneLit] Transforming Projectile at class: " + projectile.getName()); + System.out.println("[RuneLit] Transforming Projectile at class: "+projectile.getName()); ProjectileTransform pt = new ProjectileTransform(); pt.modify(projectile); } - public static void checkgetProjectiles(Class getprojectile) { - try { - Method method = getprojectile.getDeclaredMethod("getProjectiles"); - if (method != null) { - hooks.mainClientInstance = getprojectile.getName(); - System.out.println("[RuneLit] Transforming Projectile at class: " + getprojectile.getName()); - getProjectileTransform gpt = new getProjectileTransform(); - gpt.modify(getprojectile); - } - } catch (NoSuchMethodException e) { - //e.printStackTrace(); - } catch (NoClassDefFoundError e) { - //e.printStackTrace(); - } - } - - public static void transformGetProjectile(Class current) { - System.out.println("[RuneLit] Transforming getProjectile at class: " + current.getName()); - getProjectileTransform gpt = new getProjectileTransform(); - gpt.modify(current); - } - public static void checkPlayer(Class current) { try { Method method = current.getDeclaredMethod("getSkullIcon"); - if (method != null) { + if (method!=null) { hooks.playerClass = current.getName(); - System.out.println("[RuneLit] Transforming Player at class: " + current.getName()); + System.out.println("[RuneLit] Transforming Player at class: "+current.getName()); PlayerTransform pt = new PlayerTransform(); pt.modify(current); } @@ -196,9 +178,9 @@ public class ByteCodePatcher { } public static void transformPlayer(Class player) { - System.out.println("[RuneLit] Transforming Player at class: " + player.getName()); + System.out.println("[RuneLit] Transforming Player at class: "+player.getName()); PlayerTransform pt = new PlayerTransform(); pt.modify(player); - } + } diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodeUtils.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodeUtils.java index 7e4f1172aa..646d595982 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodeUtils.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodeUtils.java @@ -4,18 +4,26 @@ import javassist.CtClass; import net.runelite.client.RuneLite; import net.runelite.http.api.RuneLiteAPI; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; -import java.util.jar.*; +import java.util.jar.Attributes; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; public class ByteCodeUtils { //TODO: Write method to delete old revision injected clients. - public static File injectedClientFile = new File(RuneLite.RUNELITE_DIR + "/injectedClient-" + RuneLiteAPI.getVersion() + "-.jar"); - public static File hijackedClientFile = new File(RuneLite.RUNELITE_DIR + "/hijackedClient-" + RuneLiteAPI.getVersion() + "-.jar"); + public static File injectedClientFile = new File(RuneLite.RUNELITE_DIR+"/injectedClient-"+ RuneLiteAPI.getVersion() +"-.jar"); + public static File hijackedClientFile = new File(RuneLite.RUNELITE_DIR+"/hijackedClient-"+ RuneLiteAPI.getVersion() +"-.jar"); public static JarOutputStream target; @@ -39,12 +47,12 @@ public class ByteCodeUtils { JarEntry entry = entries.nextElement(); boolean skip = false; for (CtClass ct : ByteCodePatcher.modifiedClasses) { - if ((ct.getName() + ".class").equals(entry.getName())) { + if ((ct.getName()+".class").equals(entry.getName())) { skip = true; } } if (!skip) - add(entry); + add(entry); } for (CtClass ct : ByteCodePatcher.modifiedClasses) { @@ -59,10 +67,10 @@ public class ByteCodeUtils { private static void add(CtClass ct) { try { - JarEntry newEntry = new JarEntry(ct.getName() + ".class"); - target.putNextEntry(newEntry); - target.write(ct.toBytecode()); - target.closeEntry(); + JarEntry newEntry = new JarEntry(ct.getName()+".class"); + target.putNextEntry(newEntry); + target.write(ct.toBytecode()); + target.closeEntry(); } catch (Exception e) { e.printStackTrace(); } @@ -70,7 +78,7 @@ public class ByteCodeUtils { private static void add(JarEntry entry) throws IOException { try { - if (!entry.getName().startsWith("META") && !entry.getName().equals("")) { + if (!entry.getName().startsWith("META")&&!entry.getName().equals("")) { target.putNextEntry(entry); target.write(getBytesFromZipFile(entry.getName())); target.closeEntry(); @@ -86,7 +94,7 @@ public class ByteCodeUtils { zipFile = new ZipFile(injectedClientFile); Enumeration entries = zipFile.entries(); - while (entries.hasMoreElements()) { + while(entries.hasMoreElements()){ ZipEntry entry = entries.nextElement(); if (entry.getName().equals(entryName)) { InputStream stream = zipFile.getInputStream(entry); @@ -104,6 +112,6 @@ public class ByteCodeUtils { } catch (IOException e) { e.printStackTrace(); } - return null; + return null; } } diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/Hooks.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/Hooks.java index e4d197b2bf..6d75fc81da 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/Hooks.java @@ -5,7 +5,6 @@ public class Hooks { public String clientInstance = ""; public String actorClass = ""; public String projectileClass = ""; - public String mainClientInstance = ""; public String playerClass = ""; public Hooks() { diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ActorTransform.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ActorTransform.java index b97cd0dcfb..37b4777c56 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ActorTransform.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ActorTransform.java @@ -1,10 +1,17 @@ package net.runelite.client.rs.bytecode.transformers; +import javassist.CannotCompileException; import javassist.CtClass; import javassist.CtMethod; import javassist.CtNewMethod; import javassist.NotFoundException; import net.runelite.client.rs.bytecode.ByteCodePatcher; +import net.runelite.client.rs.bytecode.ByteCodeUtils; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; public class ActorTransform { public CtClass ct = null; @@ -29,7 +36,7 @@ public class ActorTransform { ct.addMethod(protectedAnimation); CtMethod getAnimation = ct.getDeclaredMethod("getAnimation"); ct.removeMethod(getAnimation); - getAnimation = CtNewMethod.make("public int getAnimation() { return this.getRsAnimation(); }", ct); + getAnimation = CtNewMethod.make("public int getAnimation() { return this.getRsAnimation(); }",ct); ct.addMethod(getAnimation); } catch (Exception e) { e.printStackTrace(); @@ -44,7 +51,7 @@ public class ActorTransform { getAnimationChanged = CtNewMethod.make("public void animationChanged(int n) { " + " net.runelite.api.events.AnimationChanged animationChanged = new net.runelite.api.events.AnimationChanged();" + " animationChanged.setActor((net.runelite.api.Actor)this);" + - " " + ByteCodePatcher.clientInstance + ".getCallbacks().post((java.lang.Object)animationChanged); }", ct); + " "+ByteCodePatcher.clientInstance+".getCallbacks().post((java.lang.Object)animationChanged); }",ct); ct.addMethod(getAnimationChanged); } catch (Exception e) { e.printStackTrace(); diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/PlayerTransform.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/PlayerTransform.java index 86222601d4..1fbec240c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/PlayerTransform.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/PlayerTransform.java @@ -1,4 +1,3 @@ - package net.runelite.client.rs.bytecode.transformers; import javassist.CtClass; @@ -39,26 +38,26 @@ public class PlayerTransform { String SkullIcon = "net.runelite.api.SkullIcon"; getSkullIcon = ct.getDeclaredMethod("getSkullIcon"); ct.removeMethod(getSkullIcon); - getSkullIcon = CtNewMethod.make("public " + SkullIcon + " getSkullIcon() {" + + getSkullIcon = CtNewMethod.make("public "+SkullIcon+" getSkullIcon() {" + " switch (this.getRsSkullIcon()) {" + " case 0: {" + - " return " + SkullIcon + ".SKULL; }" + + " return "+SkullIcon+".SKULL; }" + " case 1: {" + - " return " + SkullIcon + ".SKULL_FIGHT_PIT; }" + + " return "+SkullIcon+".SKULL_FIGHT_PIT; }" + " case 8: {" + - " return " + SkullIcon + ".DEAD_MAN_FIVE; }" + + " return "+SkullIcon+".DEAD_MAN_FIVE; }" + " case 9: {" + - " return " + SkullIcon + ".DEAD_MAN_FOUR; }" + + " return "+SkullIcon+".DEAD_MAN_FOUR; }" + " case 10: {" + - " return " + SkullIcon + ".DEAD_MAN_THREE; }" + + " return "+SkullIcon+".DEAD_MAN_THREE; }" + " case 11: {" + - " return " + SkullIcon + ".DEAD_MAN_TWO; }" + + " return "+SkullIcon+".DEAD_MAN_TWO; }" + " case 12: {" + - " return " + SkullIcon + ".DEAD_MAN_ONE; } }" + - " return null; }", ct); + " return "+SkullIcon+".DEAD_MAN_ONE; } }" + + " return null; }",ct); ct.addMethod(getSkullIcon); } catch (Exception e) { e.printStackTrace(); } } -} \ No newline at end of file +} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ProjectileTransform.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ProjectileTransform.java index 1ad1e94e7f..9cdae79a77 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ProjectileTransform.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ProjectileTransform.java @@ -4,6 +4,7 @@ import javassist.CtClass; import javassist.CtMethod; import javassist.CtNewMethod; import net.runelite.client.rs.bytecode.ByteCodePatcher; +import net.runelite.client.rs.bytecode.ByteCodeUtils; public class ProjectileTransform { public CtClass ct = null; diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/getProjectileTransform.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/getProjectileTransform.java deleted file mode 100644 index 4242c88f59..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/getProjectileTransform.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.runelite.client.rs.bytecode.transformers; - -import javassist.CtClass; -import javassist.CtMethod; -import javassist.CtNewMethod; -import javassist.bytecode.AnnotationsAttribute; -import javassist.bytecode.ClassFile; -import javassist.bytecode.ConstPool; -import net.runelite.client.rs.bytecode.ByteCodePatcher; - - -public class getProjectileTransform { - public CtClass ct = null; - - public void modify(Class getprojectile) { - try { - ct = ByteCodePatcher.classPool.get(getprojectile.getName()); - - transformGetProjectile(); - ByteCodePatcher.modifiedClasses.add(ct); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public void transformGetProjectile() { - - CtMethod getProjectiles; - try { - CtMethod protectedAnimation = ct.getDeclaredMethod("1protect$getProjectilesDeque"); - ct.removeMethod(protectedAnimation); - protectedAnimation.setName("getProjectilesDeque"); - ct.addMethod(protectedAnimation); - getProjectiles = ct.getDeclaredMethod("getProjectiles"); - ct.removeMethod(getProjectiles); - getProjectiles = CtNewMethod.make("public java.util.List getProjectiles() { " + - " java.util.ArrayList localArrayList = new java.util.ArrayList();" + - " net.runelite.rs.api.RSDeque localRSDeque = getProjectilesDeque();" + - " net.runelite.rs.api.RSNode localRSNode = localRSDeque.getHead();" + - " for (net.runelite.api.Node localNode = localRSNode.getNext(); localNode != localRSNode; localNode = localNode.getNext()) {" + - " net.runelite.api.Projectile localProjectile = (net.runelite.api.Projectile)localNode;" + - " localArrayList.add(localProjectile); }" + - " return localArrayList; }", ct); - - ct.addMethod(getProjectiles); - ClassFile classFile = ct.getClassFile(); - ConstPool constPool = classFile.getConstPool(); - AnnotationsAttribute attr = new AnnotationsAttribute(constPool, AnnotationsAttribute.visibleTag); - javassist.bytecode.annotation.Annotation annotation = new javassist.bytecode.annotation.Annotation("Override", constPool); - attr.setAnnotation(annotation); - getProjectiles.getMethodInfo().addAttribute(attr); - } catch (Exception e) { - e.printStackTrace(); - } - } -}