Remove discord RPC and window icons

Author: Wyvest

fabric.gradle.kts

@@ -104,13 +104,10 @@ dependencies {
         implementation("org.polyfrost.oneconfig:$module:$oneconfigVersion")
     }
 
-    implementation(libs.discord.game.sdk4j)
     implementation(libs.sentry)
     implementation(libs.bundles.ktor.client)
     implementation(libs.bundles.ktor.server)
     implementation(libs.bundles.ktor.serialization)
-
-    include(libs.discord.game.sdk4j)
 }
 
 run {

fabric.obf.gradle.kts

@@ -109,13 +109,10 @@ dependencies {
         implementation("org.polyfrost.oneconfig:$module:$oneconfigVersion")
     }
 
-    implementation(libs.discord.game.sdk4j)
     implementation(libs.sentry)
     implementation(libs.bundles.ktor.client)
     implementation(libs.bundles.ktor.server)
     implementation(libs.bundles.ktor.serialization)
-
-    include(libs.discord.game.sdk4j)
 }
 
 run {

gradle/libs.versions.toml

@@ -3,7 +3,6 @@ kotlin = "2.3.0"
 kotlinx-serialization = "2.3.0"
 atomicfu = "0.27.0"
 ktor = "3.3.1"
-discord-game-sdk4j = "v0.5.5"
 sentry = "7.18.0"
 mixin-extras = "0.5.0"
 mixin-squared = "0.3.7-beta.1"
@@ -14,7 +13,6 @@ devauth = "1.2.2"
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 
-discord-game-sdk4j = { group = "com.github.JnCrMx", name = "discord-game-sdk4j", version.ref = "discord-game-sdk4j" }
 sentry = { group = "io.sentry", name = "sentry", version.ref = "sentry" }
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
 ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }

src/main/java/org/polyfrost/polyplus/mixin/Mixin_ReplaceIcon.java

@@ -24,7 +24,6 @@ import org.polyfrost.polyplus.client.cosmetics.CosmeticService
 import org.polyfrost.polyplus.client.cosmetics.CosmeticsInitializer
 //?}
 import java.util.concurrent.atomic.AtomicBoolean
-import org.polyfrost.polyplus.client.discord.DiscordPresence
 import org.polyfrost.polyplus.client.features.DefaultSettings
 import org.polyfrost.polyplus.client.features.OnboardingFeatures
 import org.polyfrost.polyplus.client.network.http.PolyAuthorization
@@ -81,7 +80,6 @@ object PolyPlusClient {
         }
         earlyHooks.forEach(EarlyInitializable::earlyInitialize)
 
-        DiscordPresence.initialize()
         PolyConnection.initialize {
             LOGGER.info("Connected to PolyPlus WebSocket server.")
 

src/main/kotlin/org/polyfrost/polyplus/client/PolyPlusClient.kt

@@ -10,7 +10,6 @@ import org.polyfrost.oneconfig.api.config.v1.annotations.Slider
 import org.polyfrost.oneconfig.api.config.v1.annotations.Switch
 import org.polyfrost.polyplus.BackendUrl
 import org.polyfrost.polyplus.PolyPlusConstants
-import org.polyfrost.polyplus.client.discord.DiscordPresence
 import org.polyfrost.polyplus.client.gui.MainMenuBackground
 import org.polyfrost.polyplus.client.network.websocket.PolyConnection
 
@@ -115,9 +114,6 @@ object PolyPlusConfig : Config("${PolyPlusConstants.ID}.json", PolyPlusConstants
     )
     var hideMainMenuHostWorld = false
 
-    @JvmStatic @Switch(title = "Discord RPC")
-    var isDiscordEnabled = true
-
     @JvmStatic
     @Switch(
         title = "PolyPlus User Indicators",
@@ -185,10 +181,6 @@ object PolyPlusConfig : Config("${PolyPlusConstants.ID}.json", PolyPlusConstants
             if (mainMenuFpsLimitMode == MainMenuFpsLimitMode.CUSTOM) Display.SHOWN else Display.DISABLED
         }
 
-        addCallback("isDiscordEnabled") {
-            DiscordPresence.start() // Ensure that Discord RPC is restarted if the setting was toggled
-        }
-
         addCallback("apiUrl") {
             LOGGER.info("API URL changed to $apiUrl, refreshing API data...")
             PolyConnection.reconnect() // Reconnect WebSocket under new URL

src/main/kotlin/org/polyfrost/polyplus/client/PolyPlusConfig.kt

@@ -2,8 +2,10 @@ package org.polyfrost.polyplus.client
 
 import io.ktor.client.network.sockets.ConnectTimeoutException
 import io.ktor.client.network.sockets.SocketTimeoutException
+import io.ktor.client.plugins.ClientRequestException
 import io.ktor.client.plugins.HttpRequestTimeoutException
 import io.ktor.client.plugins.ServerResponseException
+import io.ktor.http.HttpStatusCode
 import io.sentry.Sentry
 import net.fabricmc.loader.api.FabricLoader
 import org.polyfrost.polyplus.PolyPlusConstants
@@ -54,6 +56,8 @@ object PolyPlusSentry {
                 is java.net.UnknownHostException,
                 is java.net.SocketException,
                 -> return true
+                is ClientRequestException ->
+                    if (cause.response.status == HttpStatusCode.Unauthorized) return true
             }
             val next = cause.cause
             if (next === cause) break