From bd4859201a31a340103057ad9010df5f63decd22 Mon Sep 17 00:00:00 2001
From: Michael Hillcox <michaelhillcox@gmail.com>
Date: Wed, 15 May 2024 11:28:14 +0100
Subject: [PATCH] feat: ported buttons support

---
 CHANGELOG.md                                  |  21 ++-
 README.md                                     |  30 +++-
 .../src/main/java/com/sunekaer/sdrp/SDRP.java |   5 -
 .../com/sunekaer/sdrp/config/SDRPConfig.java  |  10 ++
 .../sdrp/discord/ExtendedRichPresence.java    | 170 ++++++++++++++++++
 .../com/sunekaer/sdrp/discord/RPClient.java   |   8 +-
 .../java/com/sunekaer/sdrp/discord/State.java |  18 +-
 .../integration/kubejs/SDRPKubeJSWrapper.java |  17 --
 common/src/main/resources/kubejs.plugins.txt  |   1 -
 gradle.properties                             |   2 +-
 .../com/sunekaer/sdrp/neoforge/SDRPForge.java |  17 --
 .../sunekaer/sdrp/neoforge/SDRPNeoForge.java  |  19 ++
 .../kubejs/SDRPKubeJSIntegration.java         |   3 +-
 .../neoforge/kubejs/SDRPKubeJSWrapper.java    |  17 ++
 .../src/main/resources/kubejs.plugins.txt     |   1 +
 15 files changed, 289 insertions(+), 50 deletions(-)
 create mode 100644 common/src/main/java/com/sunekaer/sdrp/discord/ExtendedRichPresence.java
 delete mode 100644 common/src/main/java/com/sunekaer/sdrp/integration/kubejs/SDRPKubeJSWrapper.java
 delete mode 100644 common/src/main/resources/kubejs.plugins.txt
 delete mode 100644 neoforge/src/main/java/com/sunekaer/sdrp/neoforge/SDRPForge.java
 create mode 100644 neoforge/src/main/java/com/sunekaer/sdrp/neoforge/SDRPNeoForge.java
 rename {common/src/main/java/com/sunekaer/sdrp/integration => neoforge/src/main/java/com/sunekaer/sdrp/neoforge}/kubejs/SDRPKubeJSIntegration.java (97%)
 create mode 100644 neoforge/src/main/java/com/sunekaer/sdrp/neoforge/kubejs/SDRPKubeJSWrapper.java
 create mode 100644 neoforge/src/main/resources/kubejs.plugins.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13cdd8c..dac6514 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
-## 86.0.0
+## 86.0.1
 
 ### Changed
 
-- Updated to 1.20.6
+Buttons can be added by adding the following to the mods config file. You can have up to 2 buttons. Each button can have a label up to 32 characters long.
+
+If you do not want to have buttons, you can leave the buttons array empty.
+
+```json
+{
+  "buttons": [
+    {
+      "label": "Google",
+      "url": "https://www.google.com"
+    },
+    {
+      "label": "Yahoo",
+      "url": "https://www.yahoo.com"
+    }
+  ]
+}
+```
diff --git a/README.md b/README.md
index 585c9fe..693b2fb 100644
--- a/README.md
+++ b/README.md
@@ -111,11 +111,39 @@ We omit the `modid` from the dimension name and use the `name` instead. So `mine
 }
 ```
 
+### Config Buttons (6.0.2+)
+
+Buttons can be added by adding the following to the mods config file. 
+
+**Restrictions**
+- You can have up to 2 buttons. 
+- Each button can have a label up to 32 characters long.
+
+If you do not want to have buttons, you can leave the buttons array empty.
+
+```json5
+{
+  "...": "See above", // See above
+  "buttons": [
+    {
+      "label": "Google",
+      "url": "https://www.google.com"
+    },
+    {
+      "label": "Yahoo",
+      "url": "https://www.yahoo.com"
+    }
+  ]
+}
+```
+
 ## KubeJS Integration
 
 > **Note!**
 > 
-> KubeJS Support is only support in 3.0.0+ for `1.19.2` and `4.0.3+` for `1.20.1+`
+> KubeJS Support is only support in 3.0.0+ for `1.19.2` and `4.0.3+` for `1.20.1+`.
+> 
+> KubeJS no longer supports Forge or Fabric so support for KubeJS as of `1.20.4+` is limited to just the `NeoForge` version of our mod
 > 
 > Only `KubeJS 6+` is supported!
 
diff --git a/common/src/main/java/com/sunekaer/sdrp/SDRP.java b/common/src/main/java/com/sunekaer/sdrp/SDRP.java
index 2cf9738..64893b8 100644
--- a/common/src/main/java/com/sunekaer/sdrp/SDRP.java
+++ b/common/src/main/java/com/sunekaer/sdrp/SDRP.java
@@ -5,7 +5,6 @@
 import com.sunekaer.sdrp.config.SDRPConfig;
 import com.sunekaer.sdrp.discord.RPClient;
 import com.sunekaer.sdrp.discord.State;
-//import com.sunekaer.sdrp.integration.kubejs.SDRPKubeJSIntegration;
 import dev.architectury.event.EventResult;
 import dev.architectury.event.events.client.ClientGuiEvent;
 import dev.architectury.event.events.client.ClientLifecycleEvent;
@@ -43,10 +42,6 @@ public static void init() {
 
         EntityEvent.ADD.register(SDRP::clientJoinEvent);
         ClientGuiEvent.INIT_POST.register(SDRP::screenEvent);
-
-//        if (Platform.isModLoaded("kubejs")) {
-//            SDRPKubeJSIntegration.setup();
-//        }
     }
 
     /**
diff --git a/common/src/main/java/com/sunekaer/sdrp/config/SDRPConfig.java b/common/src/main/java/com/sunekaer/sdrp/config/SDRPConfig.java
index 6dc83b7..f686f10 100644
--- a/common/src/main/java/com/sunekaer/sdrp/config/SDRPConfig.java
+++ b/common/src/main/java/com/sunekaer/sdrp/config/SDRPConfig.java
@@ -11,6 +11,8 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 @Config(name = SDRP.MOD_ID + "-common")
@@ -30,6 +32,9 @@ public class SDRPConfig implements ConfigData {
     @Comment("When enabled, the mod will log the current state being sent to Discord")
     public boolean logState = false;
 
+    @Comment("Set custom buttons for the Discord Rich Presences. You can only have 2 buttons, each button has a label and a URL.")
+    public List<Button> buttons = new ArrayList<>();
+
     @Override
     public void validatePostLoad() {
         var oldConfig = SDRPCrossPlatform.getConfigDirectory().resolve("sdrp.json");
@@ -60,4 +65,9 @@ public static final class OldConfigEntry<T> {
         private @Nullable T value;
         private String comment;
     }
+
+    public static final class Button {
+        public String label;
+        public String url;
+    }
 }
diff --git a/common/src/main/java/com/sunekaer/sdrp/discord/ExtendedRichPresence.java b/common/src/main/java/com/sunekaer/sdrp/discord/ExtendedRichPresence.java
new file mode 100644
index 0000000..11856c3
--- /dev/null
+++ b/common/src/main/java/com/sunekaer/sdrp/discord/ExtendedRichPresence.java
@@ -0,0 +1,170 @@
+package com.sunekaer.sdrp.discord;
+
+import com.jagrosh.discordipc.entities.RichPresence;
+import org.jetbrains.annotations.Nullable;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.time.OffsetDateTime;
+
+public class ExtendedRichPresence extends RichPresence {
+    public @Nullable String button_label_1;
+    public @Nullable String button_url_1;
+    public @Nullable String button_label_2;
+    public @Nullable String button_url_2;
+
+    public ExtendedRichPresence(String state, String details, OffsetDateTime startTimestamp, OffsetDateTime endTimestamp, String largeImageKey, String largeImageText, String smallImageKey, String smallImageText, String partyId, int partySize, int partyMax, String matchSecret, String joinSecret, String spectateSecret, boolean instance) {
+        super(state, details, startTimestamp, endTimestamp, largeImageKey, largeImageText, smallImageKey, smallImageText, partyId, partySize, partyMax, matchSecret, joinSecret, spectateSecret, instance);
+    }
+
+    public ExtendedRichPresence(String state, String details, OffsetDateTime startTimestamp, OffsetDateTime endTimestamp, String largeImageKey, String largeImageText, String smallImageKey, String smallImageText, String partyId, int partySize, int partyMax, String matchSecret, String joinSecret, String spectateSecret, boolean instance, @Nullable String button_label_1, @Nullable String button_url_1, @Nullable String button_label_2, @Nullable String button_url_2) {
+        super(state, details, startTimestamp, endTimestamp, largeImageKey, largeImageText, smallImageKey, smallImageText, partyId, partySize, partyMax, matchSecret, joinSecret, spectateSecret, instance);
+        this.button_label_1 = button_label_1;
+        this.button_url_1 = button_url_1;
+        this.button_label_2 = button_label_2;
+        this.button_url_2 = button_url_2;
+    }
+
+    @Override
+    public JSONObject toJson() {
+        var jsonObject = super.toJson();
+        var buttonsObj = new JSONArray();
+        if (button_label_1 != null && button_url_1 != null) {
+            var btn1 = new JSONObject();
+            btn1.put("label", button_label_1);
+            btn1.put("url", button_url_1);
+            buttonsObj.put(btn1);
+        }
+        if (button_label_2 != null && button_url_2 != null) {
+            var btn2 = new JSONObject();
+            btn2.put("label", button_label_2);
+            btn2.put("url", button_url_2);
+            buttonsObj.put(btn2);
+        }
+        if (!buttonsObj.isEmpty()) {
+            jsonObject.put("buttons", buttonsObj);
+            if (jsonObject.has("secrets")) {
+                jsonObject.remove("secrets");
+            }
+        }
+        return jsonObject;
+    }
+
+    public static class ExtendedBuilder {
+        private String state;
+        private String details;
+        private OffsetDateTime startTimestamp;
+        private OffsetDateTime endTimestamp;
+        private String largeImageKey;
+        private String largeImageText;
+        private String smallImageKey;
+        private String smallImageText;
+        private String partyId;
+        private int partySize;
+        private int partyMax;
+        private String matchSecret;
+        private String joinSecret;
+        private String spectateSecret;
+        private boolean instance;
+
+        private String button_label_1;
+        private String button_url_1;
+        private String button_label_2;
+        private String button_url_2;
+
+        public ExtendedBuilder setState(String state) {
+            this.state = state;
+            return this;
+        }
+
+        public ExtendedBuilder setDetails(String details) {
+            this.details = details;
+            return this;
+        }
+
+        public ExtendedBuilder setStartTimestamp(OffsetDateTime startTimestamp) {
+            this.startTimestamp = startTimestamp;
+            return this;
+        }
+
+        public ExtendedBuilder setEndTimestamp(OffsetDateTime endTimestamp) {
+            this.endTimestamp = endTimestamp;
+            return this;
+        }
+
+        public ExtendedBuilder setLargeImage(String largeImageKey, String largeImageText) {
+            this.largeImageKey = largeImageKey;
+            this.largeImageText = largeImageText;
+            return this;
+        }
+
+        public ExtendedBuilder setLargeImage(String largeImageKey) {
+            return setLargeImage(largeImageKey, null);
+        }
+
+        public ExtendedBuilder setSmallImage(String smallImageKey, String smallImageText) {
+            this.smallImageKey = smallImageKey;
+            this.smallImageText = smallImageText;
+            return this;
+        }
+
+        public ExtendedBuilder setSmallImage(String smallImageKey) {
+            return setSmallImage(smallImageKey, null);
+        }
+
+        public ExtendedBuilder setParty(String partyId, int partySize, int partyMax) {
+            this.partyId = partyId;
+            this.partySize = partySize;
+            this.partyMax = partyMax;
+            return this;
+        }
+
+        public ExtendedBuilder setMatchSecret(String matchSecret) {
+            this.matchSecret = matchSecret;
+            return this;
+        }
+
+        public ExtendedBuilder setJoinSecret(String joinSecret) {
+            this.joinSecret = joinSecret;
+            return this;
+        }
+
+        public ExtendedBuilder setSpectateSecret(String spectateSecret) {
+            this.spectateSecret = spectateSecret;
+            return this;
+        }
+
+        public ExtendedBuilder setInstance(boolean instance) {
+            this.instance = instance;
+            return this;
+        }
+
+        public ExtendedBuilder setButton1(String label, String url) {
+            // If the label is greater than 32 characters, it will be truncated.
+            if (label.length() > 32) {
+                // This is a failsafe
+                label = label.substring(0, 32);
+            }
+
+            this.button_label_1 = label;
+            this.button_url_1 = url;
+            return this;
+        }
+
+        public ExtendedBuilder setButton2(String label, String url) {
+            // If the label is greater than 32 characters, it will be truncated.
+            if (label.length() > 32) {
+                // This is a failsafe
+                label = label.substring(0, 32);
+            }
+
+            this.button_label_2 = label;
+            this.button_url_2 = url;
+            return this;
+        }
+
+        public ExtendedRichPresence build() {
+            return new ExtendedRichPresence(state, details, startTimestamp, endTimestamp, largeImageKey, largeImageText, smallImageKey, smallImageText, partyId, partySize, partyMax, matchSecret, joinSecret, spectateSecret, instance, button_label_1, button_url_1, button_label_2, button_url_2);
+        }
+    }
+}
diff --git a/common/src/main/java/com/sunekaer/sdrp/discord/RPClient.java b/common/src/main/java/com/sunekaer/sdrp/discord/RPClient.java
index ef9b2a2..e22db1a 100644
--- a/common/src/main/java/com/sunekaer/sdrp/discord/RPClient.java
+++ b/common/src/main/java/com/sunekaer/sdrp/discord/RPClient.java
@@ -2,6 +2,7 @@
 
 import com.jagrosh.discordipc.IPCClient;
 import com.jagrosh.discordipc.IPCListener;
+import com.jagrosh.discordipc.entities.Callback;
 import com.jagrosh.discordipc.entities.RichPresence;
 import com.jagrosh.discordipc.entities.User;
 import com.jagrosh.discordipc.entities.pipe.PipeStatus;
@@ -88,7 +89,12 @@ private void processStateQueue() {
             return;
         }
 
-        this.client.sendRichPresence(state);
+        this.client.sendRichPresence(state, new Callback((s) -> {}, (e) -> {
+            if (SDRP.config.logState) {
+                LOGGER.error("Failed to send state to discord: {}\n {}", state.toJson().toString(), e);
+            }
+        }));
+
         if (SDRP.config.logState) {
             LOGGER.info("Sent state to discord: {}", state.toJson().toString());
         }
diff --git a/common/src/main/java/com/sunekaer/sdrp/discord/State.java b/common/src/main/java/com/sunekaer/sdrp/discord/State.java
index 8af8b7d..2741007 100644
--- a/common/src/main/java/com/sunekaer/sdrp/discord/State.java
+++ b/common/src/main/java/com/sunekaer/sdrp/discord/State.java
@@ -24,11 +24,23 @@ public State(String m, String n, String k) {
     }
 
     public RichPresence createPresence() {
-        return new RichPresence.Builder()
+        ExtendedRichPresence.ExtendedBuilder presence = new ExtendedRichPresence.ExtendedBuilder()
                 .setState(I18n.get(message))
                 .setStartTimestamp(SDRP.START_TIME)
                 .setLargeImage("logo", I18n.get("sdrp.logo"))
-                .setSmallImage(imageKey, I18n.get(imageName))
-                .build();
+                .setSmallImage(imageKey, I18n.get(imageName));
+
+        if (!SDRP.config.buttons.isEmpty()) {
+            var buttonOne = SDRP.config.buttons.get(0);
+            presence.setButton1(buttonOne.label, buttonOne.url);
+
+            if (SDRP.config.buttons.size() > 1) {
+                var buttonTwo = SDRP.config.buttons.get(1);
+                presence.setButton2(buttonTwo.label, buttonTwo.url);
+            }
+        }
+
+        return presence.build();
     }
+
 }
diff --git a/common/src/main/java/com/sunekaer/sdrp/integration/kubejs/SDRPKubeJSWrapper.java b/common/src/main/java/com/sunekaer/sdrp/integration/kubejs/SDRPKubeJSWrapper.java
deleted file mode 100644
index 8eaa16e..0000000
--- a/common/src/main/java/com/sunekaer/sdrp/integration/kubejs/SDRPKubeJSWrapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.sunekaer.sdrp.integration.kubejs;
-
-import com.jagrosh.discordipc.entities.RichPresence;
-import com.sunekaer.sdrp.discord.State;
-import net.minecraft.client.resources.language.I18n;
-
-import static com.sunekaer.sdrp.SDRP.RP_CLIENT;
-
-public class SDRPKubeJSWrapper {
-    public static void setState(String message, String imageName, String imageKey) {
-        RP_CLIENT.setState(new State(I18n.get(message),  I18n.get(imageName), imageKey).createPresence());
-    }
-
-    public static RichPresence getCurrentState() {
-        return RP_CLIENT.getCurrentState();
-    }
-}
diff --git a/common/src/main/resources/kubejs.plugins.txt b/common/src/main/resources/kubejs.plugins.txt
deleted file mode 100644
index ba83fe4..0000000
--- a/common/src/main/resources/kubejs.plugins.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.sunekaer.sdrp.integration.kubejs.SDRPKubeJSIntegration sdrp
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index deb1663..27f21dd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ minecraft_version=1.20.6
 enabled_platforms=fabric,neoforge
 
 archives_base_name=SimpleDiscordRichPresence
-mod_version=86.0.0
+mod_version=86.0.1
 maven_group=com.sunekaer.mods
 
 curseforge_id=334853
diff --git a/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/SDRPForge.java b/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/SDRPForge.java
deleted file mode 100644
index 90fc47d..0000000
--- a/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/SDRPForge.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.sunekaer.sdrp.neoforge;
-
-import com.sunekaer.sdrp.SDRP;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.fml.common.Mod;
-
-@Mod(SDRP.MOD_ID)
-public class SDRPForge {
-    public SDRPForge() {
-        // Submit our event bus to let architectury register our content on the right time
-        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
-//            EventBuses.registerModEventBus(SDRP.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus());
-            SDRP.init();
-        });
-    }
-}
diff --git a/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/SDRPNeoForge.java b/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/SDRPNeoForge.java
new file mode 100644
index 0000000..ca62ee8
--- /dev/null
+++ b/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/SDRPNeoForge.java
@@ -0,0 +1,19 @@
+package com.sunekaer.sdrp.neoforge;
+
+import com.sunekaer.sdrp.SDRP;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.loading.FMLEnvironment;
+
+@Mod(SDRP.MOD_ID)
+public class SDRPNeoForge {
+    public SDRPNeoForge() {
+        if (!FMLEnvironment.dist.isClient()) {
+            return;
+        }
+
+        SDRP.init();
+//        if (Platform.isModLoaded("kubejs")) {
+//            SDRPKubeJSIntegration.setup();
+//        }
+    }
+}
diff --git a/common/src/main/java/com/sunekaer/sdrp/integration/kubejs/SDRPKubeJSIntegration.java b/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/kubejs/SDRPKubeJSIntegration.java
similarity index 97%
rename from common/src/main/java/com/sunekaer/sdrp/integration/kubejs/SDRPKubeJSIntegration.java
rename to neoforge/src/main/java/com/sunekaer/sdrp/neoforge/kubejs/SDRPKubeJSIntegration.java
index f5abcc4..d3cb4e9 100644
--- a/common/src/main/java/com/sunekaer/sdrp/integration/kubejs/SDRPKubeJSIntegration.java
+++ b/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/kubejs/SDRPKubeJSIntegration.java
@@ -1,5 +1,4 @@
-//package com.sunekaer.sdrp.integration.kubejs;
-//
+//package com.sunekaer.sdrp.neoforge.kubejs;
 //
 //import dev.architectury.event.EventResult;
 //import dev.architectury.event.events.common.EntityEvent;
diff --git a/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/kubejs/SDRPKubeJSWrapper.java b/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/kubejs/SDRPKubeJSWrapper.java
new file mode 100644
index 0000000..3698c50
--- /dev/null
+++ b/neoforge/src/main/java/com/sunekaer/sdrp/neoforge/kubejs/SDRPKubeJSWrapper.java
@@ -0,0 +1,17 @@
+//package com.sunekaer.sdrp.neoforge.kubejs;
+//
+//import com.jagrosh.discordipc.entities.RichPresence;
+//import com.sunekaer.sdrp.discord.State;
+//import net.minecraft.client.resources.language.I18n;
+//
+//import static com.sunekaer.sdrp.SDRP.RP_CLIENT;
+//
+//public class SDRPKubeJSWrapper {
+//    public static void setState(String message, String imageName, String imageKey) {
+//        RP_CLIENT.setState(new State(I18n.get(message),  I18n.get(imageName), imageKey).createPresence());
+//    }
+//
+//    public static RichPresence getCurrentState() {
+//        return RP_CLIENT.getCurrentState();
+//    }
+//}
diff --git a/neoforge/src/main/resources/kubejs.plugins.txt b/neoforge/src/main/resources/kubejs.plugins.txt
new file mode 100644
index 0000000..9e48dd9
--- /dev/null
+++ b/neoforge/src/main/resources/kubejs.plugins.txt
@@ -0,0 +1 @@
+com.sunekaer.sdrp.neoforge.kubejs.SDRPKubeJSIntegration sdrp