From 40806312cd25d4c7d5e5f4cc7756b8aab4580071 Mon Sep 17 00:00:00 2001
From: Lucwousin <Lucwousin@users.noreply.github.com>
Date: Mon, 22 Jun 2020 18:11:03 +0200
Subject: [PATCH 1/4] Fix client filterResources task

---
 runelite-client/runelite-client.gradle.kts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts
index cfe146ffe5..ac26a412fe 100644
--- a/runelite-client/runelite-client.gradle.kts
+++ b/runelite-client/runelite-client.gradle.kts
@@ -124,16 +124,10 @@ tasks {
 
         inputs.properties(tokens)
 
-        from("src/main/resources") {
-            include("sentry.properties")
-        }
+        from("src/main/resources/")
+        include("**/*.properties")
         into("${buildDir}/resources/main")
 
-        from("src/main/resources/net/runelite/client") {
-            include("open.osrs.properties")
-        }
-        into("${buildDir}/resources/main/net/runelite/client")
-
         filter(ReplaceTokens::class, "tokens" to tokens)
         filteringCharset = "UTF-8"
     }

From 20d3646e4e71d8609657bbc131c76d47e14a5806 Mon Sep 17 00:00:00 2001
From: Lucwousin <Lucwousin@users.noreply.github.com>
Date: Mon, 22 Jun 2020 18:13:59 +0200
Subject: [PATCH 2/4] Fix sentry.properties and bump up log level for pf4j and
 jgroups

---
 runelite-client/src/main/resources/logback.xml       | 4 ++--
 runelite-client/src/main/resources/sentry.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/runelite-client/src/main/resources/logback.xml b/runelite-client/src/main/resources/logback.xml
index b8ca95b9fb..87ea8ef5a9 100644
--- a/runelite-client/src/main/resources/logback.xml
+++ b/runelite-client/src/main/resources/logback.xml
@@ -68,6 +68,6 @@
 		<appender-ref ref="Sentry" />
 	</root>
 
-	<logger name="org.pf4j.AbstractPluginManager" level="OFF"/>
-	<logger name="org.jgroups" level="ERROR"/>
+	<logger name="org.pf4j.AbstractPluginManager" level="WARN"/>
+	<logger name="org.jgroups" level="WARN"/>
 </configuration>
\ No newline at end of file
diff --git a/runelite-client/src/main/resources/sentry.properties b/runelite-client/src/main/resources/sentry.properties
index 5320ed4896..465d896b71 100644
--- a/runelite-client/src/main/resources/sentry.properties
+++ b/runelite-client/src/main/resources/sentry.properties
@@ -1,3 +1,3 @@
 dsn=https://fa31d674e44247fa93966c69a903770f@sentry.io/1811856
 release=@open.osrs.version@
-stacktrace.app.packages=stacktrace.app.packages=net.runelite.client
\ No newline at end of file
+stacktrace.app.packages=net.runelite,com.openosrs
\ No newline at end of file

From 220686ba9afccd4b7b720f028458d7434f90fa50 Mon Sep 17 00:00:00 2001
From: Lucwousin <Lucwousin@users.noreply.github.com>
Date: Mon, 22 Jun 2020 18:57:51 +0200
Subject: [PATCH 3/4] Add version to jgroups xml

---
 runelite-client/src/main/resources/udp.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runelite-client/src/main/resources/udp.xml b/runelite-client/src/main/resources/udp.xml
index b8653dbb34..2dad4551c8 100644
--- a/runelite-client/src/main/resources/udp.xml
+++ b/runelite-client/src/main/resources/udp.xml
@@ -6,7 +6,8 @@
 
 <config xmlns="urn:org:jgroups"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd">
+		xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd"
+        version="4.2.4.Final">
 	<UDP
 			bind_addr="127.0.0.1"
 			mcast_port="${jgroups.udp.mcast_port:45588}"

From 31a5061478641675201820a64eb81cc13614694e Mon Sep 17 00:00:00 2001
From: Lucwousin <Lucwousin@users.noreply.github.com>
Date: Tue, 23 Jun 2020 20:38:43 +0200
Subject: [PATCH 4/4] rename udp.xml to make sure we use the correct one,
 try-with-res the stream

---
 .../main/java/net/runelite/client/util/Groups.java | 14 +++++++++-----
 .../main/resources/{udp.xml => udp-openosrs.xml}   |  0
 2 files changed, 9 insertions(+), 5 deletions(-)
 rename runelite-client/src/main/resources/{udp.xml => udp-openosrs.xml} (100%)

diff --git a/runelite-client/src/main/java/net/runelite/client/util/Groups.java b/runelite-client/src/main/java/net/runelite/client/util/Groups.java
index 00ff6082e7..c820a276ef 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/Groups.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/Groups.java
@@ -1,6 +1,7 @@
 package net.runelite.client.util;
 
 import io.reactivex.rxjava3.subjects.PublishSubject;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -48,11 +49,14 @@ public class Groups extends ReceiverAdapter
 	{
 		this.openOSRSConfig = openOSRSConfig;
 
-		this.channel = new JChannel(RuneLite.class.getResourceAsStream("/udp.xml"))
-			.setName(RuneLite.uuid)
-			.setReceiver(this)
-			.setDiscardOwnMessages(true)
-			.connect("openosrs");
+		try (final InputStream is = RuneLite.class.getResourceAsStream("/udp-openosrs.xml"))
+		{
+			this.channel = new JChannel(is)
+				.setName(RuneLite.uuid)
+				.setReceiver(this)
+				.setDiscardOwnMessages(true)
+				.connect("openosrs");
+		}
 
 		eventBus.subscribe(ClientShutdown.class, this, (e) -> {
 			Future<Void> f = close();
diff --git a/runelite-client/src/main/resources/udp.xml b/runelite-client/src/main/resources/udp-openosrs.xml
similarity index 100%
rename from runelite-client/src/main/resources/udp.xml
rename to runelite-client/src/main/resources/udp-openosrs.xml