From eba3866e1a07546484b80b113f280d32fc1b6c7d Mon Sep 17 00:00:00 2001
From: TheRealNull <therealnull@gmail.com>
Date: Thu, 24 Dec 2020 13:44:24 -0500
Subject: [PATCH] fix shading injected client, remove assertion mandate

---
 .gitignore                                         |  1 +
 .../main/java/com/openosrs/injector/Injector.java  |  2 +-
 runelite-client/runelite-client.gradle.kts         |  8 +++++++-
 .../main/java/net/runelite/client/RuneLite.java    | 14 --------------
 .../java/net/runelite/client/rs/ClientLoader.java  |  4 ++--
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 05b3a9ca66..d6037e32e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ runelite-client/dependencies.txt
 .vscode
 .factorypath
 hs_err_pid*.log
+/runelite-client/src/main/resources/net/runelite/client/injected-client.oprs
diff --git a/injector/src/main/java/com/openosrs/injector/Injector.java b/injector/src/main/java/com/openosrs/injector/Injector.java
index 57615de54d..84d1429680 100644
--- a/injector/src/main/java/com/openosrs/injector/Injector.java
+++ b/injector/src/main/java/com/openosrs/injector/Injector.java
@@ -43,7 +43,7 @@ public class Injector extends InjectData implements InjectTaskHandler
 			new RSApi(rsapi)
 		);
 		inject();
-		save(new File("../runelite-client/src/main/resources/net/runelite/client/injected-client.jar"));
+		save(new File("../runelite-client/src/main/resources/net/runelite/client/injected-client.oprs"));
 	}
 
 	public static void main(String[] args)
diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts
index 3f47b98642..deccc7b0f3 100644
--- a/runelite-client/runelite-client.gradle.kts
+++ b/runelite-client/runelite-client.gradle.kts
@@ -127,7 +127,7 @@ tasks {
 
     processResources {
         dependsOn(":injector:build")
-        finalizedBy("filterResources")
+        finalizedBy("filterResources", "packInjectedClient")
     }
 
     register<Copy>("filterResources") {
@@ -149,6 +149,12 @@ tasks {
         filteringCharset = "UTF-8"
     }
 
+    register<Copy>("packInjectedClient") {
+        from("src/main/resources/")
+        include("**/injected-client.oprs")
+        into("${buildDir}/resources/main")
+    }
+
     jar {
         manifest {
             attributes(mutableMapOf("Main-Class" to "net.runelite.client.RuneLite"))
diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
index 988e73c9f1..865c94d847 100644
--- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java
+++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
@@ -262,20 +262,6 @@ public class RuneLite
 
 			final boolean developerMode = true;
 
-			if (developerMode)
-			{
-				boolean assertions = false;
-				assert assertions = true;
-				if (!assertions)
-				{
-					SwingUtilities.invokeLater(() ->
-						new FatalErrorDialog("Developers should enable assertions; Add `-ea` to your JVM arguments`")
-							.addBuildingGuide()
-							.open());
-					return;
-				}
-			}
-
 			PROFILES_DIR.mkdirs();
 
 			log.info("RuneLite {} (launcher version {}) starting up, args: {}",
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 ac3ba5507c..af99a64106 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
@@ -139,8 +139,8 @@ public class ClientLoader implements Supplier<Applet>
 				// create the classloader for the jar while we hold the lock, and eagerly load and link all classes
 				// in the jar. Otherwise the jar can change on disk and can break future classloads.
 				File oprsInjected = new File(System.getProperty("user.home") + "/.openosrs/cache/injected-client.jar");
-				InputStream initialStream = RuneLite.class.getResourceAsStream("injected-client.jar");
-				if (oprsInjected.length() != RuneLite.class.getResource("injected-client.jar").getFile().length())
+				InputStream initialStream = RuneLite.class.getResourceAsStream("injected-client.oprs");
+				if (oprsInjected.length() != RuneLite.class.getResource("injected-client.oprs").getFile().length())
 					FileUtils.copyInputStreamToFile(initialStream, oprsInjected);
 
 				classLoader = createJarClassLoader(oprsInjected);