From 5a8769bee997f9cc024bdda619289be22b9465c0 Mon Sep 17 00:00:00 2001 From: hypherionmc Date: Mon, 2 Dec 2024 11:46:36 +0200 Subject: [PATCH] Prepare for release and deprecate old RPC sdk --- .../craterlib/core/rpcsdk/DiscordEventHandlers.java | 1 + .../com/hypherionmc/craterlib/core/rpcsdk/DiscordRPC.java | 1 + .../craterlib/core/rpcsdk/DiscordRichPresence.java | 1 + .../com/hypherionmc/craterlib/core/rpcsdk/DiscordUser.java | 1 + .../craterlib/core/rpcsdk/callbacks/DisconnectedCallback.java | 1 + .../craterlib/core/rpcsdk/callbacks/ErroredCallback.java | 1 + .../craterlib/core/rpcsdk/callbacks/JoinGameCallback.java | 1 + .../craterlib/core/rpcsdk/callbacks/JoinRequestCallback.java | 1 + .../craterlib/core/rpcsdk/callbacks/ReadyCallback.java | 1 + .../craterlib/core/rpcsdk/callbacks/SpectateGameCallback.java | 1 + .../hypherionmc/craterlib/core/rpcsdk/helpers/RPCButton.java | 1 + Paper/build.gradle | 2 -- changelog.md | 4 ++-- 13 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordEventHandlers.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordEventHandlers.java index 3f1ffcb..56942b0 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordEventHandlers.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordEventHandlers.java @@ -11,6 +11,7 @@ import java.util.List; * Class containing references to all available discord event handles. * Registering a handler is optional, and non-assigned handlers will be ignored */ +@Deprecated(forRemoval = true) public class DiscordEventHandlers extends Structure { // Callback for when the RPC was initialized successfully diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordRPC.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordRPC.java index 7cf53ff..3a68db9 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordRPC.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordRPC.java @@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable; * @author HypherionSA * Java Wrapper of the Discord-RPC Library */ +@Deprecated(forRemoval = true) public interface DiscordRPC extends Library { DiscordRPC INSTANCE = Native.load("discord-rpc", DiscordRPC.class); diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordRichPresence.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordRichPresence.java index 51fd720..b0e5e04 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordRichPresence.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordRichPresence.java @@ -13,6 +13,7 @@ import java.util.List; * @author HypherionSA * Class reprenting a Discord RPC activity */ +@Deprecated(forRemoval = true) public class DiscordRichPresence extends Structure { // First line of text on the RPC diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordUser.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordUser.java index e8bc085..0d48713 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordUser.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/DiscordUser.java @@ -9,6 +9,7 @@ import java.util.List; * @author HypherionSA * Class representing the Discord User */ +@Deprecated(forRemoval = true) public class DiscordUser extends Structure { // The User ID of the User diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/DisconnectedCallback.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/DisconnectedCallback.java index 7ea59e1..d3d8525 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/DisconnectedCallback.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/DisconnectedCallback.java @@ -6,6 +6,7 @@ import com.sun.jna.Callback; * @author HypherionSA * Callback for when the Discord RPC disconnects */ +@Deprecated(forRemoval = true) public interface DisconnectedCallback extends Callback { /** diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/ErroredCallback.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/ErroredCallback.java index 1f86c90..fe07c6f 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/ErroredCallback.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/ErroredCallback.java @@ -6,6 +6,7 @@ import com.sun.jna.Callback; * @author HypherionSA * Callback for when the RPC ran into an error */ +@Deprecated(forRemoval = true) public interface ErroredCallback extends Callback { /** diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/JoinGameCallback.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/JoinGameCallback.java index cc752af..a7dbf5b 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/JoinGameCallback.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/JoinGameCallback.java @@ -6,6 +6,7 @@ import com.sun.jna.Callback; * @author HypherionSA * Callback for when someone was approved to join your game */ +@Deprecated(forRemoval = true) public interface JoinGameCallback extends Callback { /** diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/JoinRequestCallback.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/JoinRequestCallback.java index 115fd4f..f263bea 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/JoinRequestCallback.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/JoinRequestCallback.java @@ -7,6 +7,7 @@ import com.sun.jna.Callback; * @author HypherionSA * Callback for when someone requests to join your game */ +@Deprecated(forRemoval = true) public interface JoinRequestCallback extends Callback { /** diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/ReadyCallback.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/ReadyCallback.java index 66f3b59..1ec9153 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/ReadyCallback.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/ReadyCallback.java @@ -7,6 +7,7 @@ import com.sun.jna.Callback; * @author HypherionSA * Callback for when the RPC has connected successfully */ +@Deprecated(forRemoval = true) public interface ReadyCallback extends Callback { /** diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/SpectateGameCallback.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/SpectateGameCallback.java index 979e53d..92cf8e4 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/SpectateGameCallback.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/callbacks/SpectateGameCallback.java @@ -6,6 +6,7 @@ import com.sun.jna.Callback; * @author HypherionSA * Callback for when someone is requesting to spectate your game */ +@Deprecated(forRemoval = true) public interface SpectateGameCallback extends Callback { /** diff --git a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/helpers/RPCButton.java b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/helpers/RPCButton.java index ab2bdc8..84e90f4 100644 --- a/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/helpers/RPCButton.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/core/rpcsdk/helpers/RPCButton.java @@ -9,6 +9,7 @@ import java.io.Serializable; * Helper class to add Buttons to Discord Rich Presence * This can not be used with Join/Spectate */ +@Deprecated(forRemoval = true) public class RPCButton implements Serializable { // The label of the button diff --git a/Paper/build.gradle b/Paper/build.gradle index db96228..55726aa 100644 --- a/Paper/build.gradle +++ b/Paper/build.gradle @@ -61,11 +61,9 @@ tasks.assemble { publisher { apiKeys { - modrinth(System.getenv("MODRINTH_TOKEN")) nightbloom(System.getenv("PLATFORM_KEY")) } - setModrinthID(modrinth_id) setNightbloomID("craterlib") setVersionType("alpha") setChangelog(rootProject.file("changelog.md")) diff --git a/changelog.md b/changelog.md index 4ecb3ae..09222a4 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,7 @@ **New Features**: -- Paper Support. Currently only available on Modrinth and NightBloom -- Added API's for working with FTB Ranks and LuckPerms groups +- Paper Support. Currently only available on [NightBloom](https://nightbloom.cc/project/craterlib/files?loader=paper) +- Added APIs for working with FTB Ranks and LuckPerms groups **Bug Fixes**: