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" } 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 f = close(); 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 @@ - - + + \ 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 diff --git a/runelite-client/src/main/resources/udp.xml b/runelite-client/src/main/resources/udp-openosrs.xml similarity index 97% rename from runelite-client/src/main/resources/udp.xml rename to runelite-client/src/main/resources/udp-openosrs.xml index b8653dbb34..2dad4551c8 100644 --- a/runelite-client/src/main/resources/udp.xml +++ b/runelite-client/src/main/resources/udp-openosrs.xml @@ -6,7 +6,8 @@ + xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd" + version="4.2.4.Final">