diff --git a/build.gradle b/build.gradle index afb9b11..6f87330 100644 --- a/build.gradle +++ b/build.gradle @@ -48,19 +48,16 @@ dependencies { compileOnly("org.spigotmc:spigot-api:1.21.3-R0.1-SNAPSHOT") compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") - include(implementation("dev.xdpxi:dependencies:1.1.8")) + include(implementation("dev.xdpxi:dependencies:1.1.9")) modImplementation("net.fabricmc:fabric-loader:0.16.9") modImplementation("net.fabricmc.fabric-api:fabric-api:0.108.1+") modImplementation("com.terraformersmc:modmenu:11.0.3") modImplementation("me.shedaniel.cloth:cloth-config-fabric:16.0.141"){exclude(group: "net.fabricmc.fabric-api")} modImplementation("maven.modrinth:ducky-updater-lib:2024.10.2") - implementation("club.minnced:discord-rpc-release:v3.4.0") - implementation("com.github.MinnDevelopment:java-discord-rpc:2.0.2") implementation("org.tomlj:tomlj:1.1.1") implementation("org.antlr:antlr4-runtime:4.13.2") implementation("org.json:json:20240303") - implementation("com.formdev:flatlaf:3.5.2") implementation("org.commonmark:commonmark:0.24.0") implementation("org.projectlombok:lombok:1.18.36") implementation("org.beanshell:bsh:3.0.0-SNAPSHOT") diff --git a/gradle/deps/dependencies-1.1.8.jar b/gradle/deps/dependencies-1.1.9.jar similarity index 58% rename from gradle/deps/dependencies-1.1.8.jar rename to gradle/deps/dependencies-1.1.9.jar index ae977d6..8a56f42 100644 Binary files a/gradle/deps/dependencies-1.1.8.jar and b/gradle/deps/dependencies-1.1.9.jar differ diff --git a/gradle/deps/discord-rpc-release-v3.4.0.jar b/gradle/deps/discord-rpc-release-v3.4.0.jar deleted file mode 100644 index f5bee0a..0000000 Binary files a/gradle/deps/discord-rpc-release-v3.4.0.jar and /dev/null differ diff --git a/src/client/java/dev/xdpxi/xdlib/DiscordRPCHandler.java b/src/client/java/dev/xdpxi/xdlib/DiscordRPCHandler.java deleted file mode 100644 index adfc28b..0000000 --- a/src/client/java/dev/xdpxi/xdlib/DiscordRPCHandler.java +++ /dev/null @@ -1,68 +0,0 @@ -package dev.xdpxi.xdlib; - -import club.minnced.discord.rpc.DiscordEventHandlers; -import club.minnced.discord.rpc.DiscordRPC; -import club.minnced.discord.rpc.DiscordRichPresence; -import dev.xdpxi.xdlib.config.configManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class DiscordRPCHandler { - public static final Logger LOGGER = LoggerFactory.getLogger("xdlib"); - private static Thread callbackThread; - private static boolean initialized = false; - - public static void init() { - try { - if (initialized) { - return; - } - - DiscordRPC lib = DiscordRPC.INSTANCE; - String applicationId = "1268895788558319626"; - String steamId = ""; - DiscordEventHandlers handlers = new DiscordEventHandlers(); - handlers.ready = (user) -> LOGGER.info("[XDLib] - Started Discord RPC!"); - lib.Discord_Initialize(applicationId, handlers, true, steamId); - - DiscordRichPresence presence = new DiscordRichPresence(); - presence.startTimestamp = System.currentTimeMillis() / 1000; - presence.details = "Playing Minecraft"; - lib.Discord_UpdatePresence(presence); - - callbackThread = new Thread(() -> { - while (!Thread.currentThread().isInterrupted()) { - lib.Discord_RunCallbacks(); - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - }, "RPC-Handler"); - callbackThread.start(); - - initialized = true; - } catch (Exception e) { - LOGGER.error("[XDLib] - Failed to initialize Discord RPC.", e); - } - - if (!configManager.configData.isDiscordRPC()) { - shutdown(); - } - } - - public static void shutdown() { - try { - if (callbackThread != null && callbackThread.isAlive()) { - callbackThread.interrupt(); - callbackThread.join(); - } - DiscordRPC.INSTANCE.Discord_Shutdown(); - } catch (Exception e) { - LOGGER.error("[XDLib] - Failed to shutdown Discord RPC: ", e); - } finally { - initialized = false; - } - } -} \ No newline at end of file diff --git a/src/client/java/dev/xdpxi/xdlib/config/clothConfig/getModConfigScreen.java b/src/client/java/dev/xdpxi/xdlib/config/clothConfig/getModConfigScreen.java index 97ecb3b..ed6eba4 100644 --- a/src/client/java/dev/xdpxi/xdlib/config/clothConfig/getModConfigScreen.java +++ b/src/client/java/dev/xdpxi/xdlib/config/clothConfig/getModConfigScreen.java @@ -56,6 +56,7 @@ public Screen getModConfigScreen(Screen parent) { .setTitle(Text.of("XDLib Configuration")); builder.getOrCreateCategory(Text.of("Main")) + .addEntry(createBooleanToggle(builder, "Add Custom Modmenu Badges", configData.isCustomBadges(), configData::setCustomBadges, true)) .addEntry(createBooleanToggle(builder, "Show Changelog On Every Startup", configData.isChangelogEveryStartup(), configData::setChangelogEveryStartup, false)) .addEntry(createBooleanToggle(builder, "Disable Plugins", configData.isDisablePlugins(), newVersion -> { configData.setDisablePlugins(newVersion); @@ -67,10 +68,6 @@ public Screen getModConfigScreen(Screen parent) { updatePluginsCategory(builder, configData.isDisablePlugins()); - builder.getOrCreateCategory(Text.of("Compatibility")) - .addEntry(createBooleanToggle(builder, "Add Custom Modmenu Badges", configData.isCustomBadges(), configData::setCustomBadges, true)) - .addEntry(createBooleanToggle(builder, "Enable Discord RPC", configData.isDiscordRPC(), configData::setDiscordRPC, true)); - return builder.build(); } diff --git a/src/client/java/dev/xdpxi/xdlib/config/configManager.java b/src/client/java/dev/xdpxi/xdlib/config/configManager.java index da3abb6..d745e80 100644 --- a/src/client/java/dev/xdpxi/xdlib/config/configManager.java +++ b/src/client/java/dev/xdpxi/xdlib/config/configManager.java @@ -71,7 +71,6 @@ public Screen getModConfigScreen(ConfigData configData, Screen parent) { public static class ConfigData { private boolean customBadges = true; private boolean changelogEveryStartup = false; - private boolean discordRPC = true; private boolean disablePlugins = false; private boolean disableChangelog = false; private boolean disableTitlePopups = false; @@ -94,14 +93,6 @@ public void setChangelogEveryStartup(boolean changelogEveryStartup) { this.changelogEveryStartup = changelogEveryStartup; } - public boolean isDiscordRPC() { - return discordRPC; - } - - public void setDiscordRPC(boolean discordRPC) { - this.discordRPC = discordRPC; - } - public boolean isDisablePlugins() { return disablePlugins; }