published discord api and server instance

README.md

@@ -27,7 +27,7 @@ Release artifact
 <dependency>
     <groupId>com.github.zrdj</groupId>
     <artifactId>javachord</artifactId>
-    <version>3.8.0.4</version>
+    <version>3.8.0.5</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.zrdj</groupId>
     <artifactId>javachord</artifactId>
-    <version>3.8.0.4</version>
+    <version>3.8.0.5</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

src/main/java/com/github/zrdj/javachord/DiscordInstanceAware.java

@@ -0,0 +1,15 @@
+package com.github.zrdj.javachord;
+
+import org.javacord.api.DiscordApi;
+import org.javacord.api.entity.server.Server;
+
+import java.util.Optional;
+
+public interface DiscordInstanceAware {
+    default DiscordApi discordInstance() {
+        return Javachord.Instance.Get.discordInstance;
+    }
+    default Optional<Server> serverInstance() {
+        return Javachord.Instance.Get.serverInstance;
+    }
+}

src/main/java/com/github/zrdj/javachord/Javachord.java

@@ -33,6 +33,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -42,6 +43,8 @@ enum Instance implements Javachord {
         Get;
         private final List<ApplicationCommand> _commands = new ArrayList<>();
         private final List<GloballyAttachableListener> _listeners = new ArrayList<>();
+        public DiscordApi discordInstance;
+        public Optional<Server> serverInstance = Optional.empty();
 
         public void addCommand(final ApplicationCommand command) {
             _commands.add(command);
@@ -50,11 +53,14 @@ public void addListener(final GloballyAttachableListener listener) {
             _listeners.add(listener);
         }
         public void register(final DiscordApi discordApi) {
+            discordInstance = discordApi;
             var commandSet = _commands.stream().map(ApplicationCommand::toSlashCommand).collect(Collectors.toSet());
             discordApi.bulkOverwriteGlobalApplicationCommands(commandSet);
             _listeners.forEach(discordApi::addListener);
         }
         public void register(final DiscordApi discordApi, final Server server) {
+            discordInstance = discordApi;
+            serverInstance = Optional.of(server);
             var commandSet = _commands.stream().map(ApplicationCommand::toSlashCommand).collect(Collectors.toSet());
             discordApi.bulkOverwriteServerApplicationCommands(server, commandSet);
             _listeners.forEach(discordApi::addListener);

src/main/java/com/github/zrdj/javachord/command/ApplicationCommandBehavior.java

@@ -2,6 +2,7 @@
 
 import com.github.zrdj.javachord.Javachord;
 import org.javacord.api.DiscordApi;
+import org.javacord.api.entity.server.Server;
 import org.javacord.api.event.interaction.SlashCommandCreateEvent;
 import org.javacord.api.interaction.SlashCommand;
 import org.javacord.api.interaction.SlashCommandBuilder;
@@ -18,7 +19,6 @@ abstract class ApplicationCommandBehavior implements ApplicationCommand, SlashCo
     protected final String _description;
     protected final Optional<ApplicationCommandGroup> _parentCommand;
     private final List<ApplicationCommandOption<?>> _options;
-    protected DiscordApi _discordApi;
 
     ApplicationCommandBehavior(final String name, final String description, ApplicationCommandGroup parentCommand, List<ApplicationCommandOption<?>> options) {
         _name = name.contains(" ") ? name.replaceAll(" ", "-") : name;