diff --git a/MCdiscord_bot-1.jar b/MCdiscord_bot-1.jar index aa0ae81..5a9dda1 100644 Binary files a/MCdiscord_bot-1.jar and b/MCdiscord_bot-1.jar differ diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml new file mode 100644 index 0000000..eba75a8 --- /dev/null +++ b/dependency-reduced-pom.xml @@ -0,0 +1,93 @@ + + + 4.0.0 + com.example + MCdiscord_bot + 1.1be04 + + + + maven-shade-plugin + 3.5.2 + + + package + + shade + + + + + net.dv8tion:JDA + + + + + net.dv8tion + com.example.MCdiscordbot.shaded.net.dv8tion + + + + + + + + + + + spigot-repo + spigot-1.20.4 + https://repo.rosewooddev.io/repository/public/ + + + buk-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + jcenter + jcenter-bintray + https://jcenter.bintray.com + + + discordJDA + JDA for Discord + https://github.com/DV8FromTheWorld/JDA + + + + + org.bukkit + bukkit + 1.15.2-R0.1-SNAPSHOT + provided + + + org.spigotmc + spigot + 1.20.4 + provided + + + org.apache.logging.log4j + log4j-core + 2.23.1 + compile + + + org.apache.logging.log4j + log4j-api + 2.23.1 + compile + + + net.katsstuff + ackcord-data_sjs1_2.13 + 2.0.0.0-M1 + compile + + + + 21 + 21 + + diff --git a/pom.xml b/pom.xml index 1f85bb1..0e1068c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.example MCdiscord_bot - 1.1be02 + 1.1be04 jar @@ -33,12 +33,6 @@ https://jcenter.bintray.com - - discordJDA - JDA for Discord - https://github.com/DV8FromTheWorld/JDA - - @@ -55,29 +49,14 @@ 1.20.4 provided - - - - net.dv8tion - JDA - 5.0.0-alpha.4 - - - jflac - jflac - - - tritonus - tritonus-dsp - - - club.minnced - opus-java - - - compile + + + com.discord4j + discord4j-core + 3.3.0-RC1 + org.apache.logging.log4j @@ -104,46 +83,33 @@ - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 + + org.apache.maven.plugins + maven-shade-plugin + 3.5.2 + + + package + + shade + - - - src/main/resources - - **/*.yml - - - - - jar-with-dependencies - - - - disMCbot - - - . - - - false - ${project.artifactId}-${project.version} - - plugin.yml - + + + club.minced.discord4j + + + + + club.minced + com.example.MCdiscordbot.shaded.club.minced + + - - - make-assembly - package - - single - - - - + + + + diff --git a/src/main/java/disMCbot.java b/src/main/java/disMCbot.java index a01b6e9..3ddbd9d 100644 --- a/src/main/java/disMCbot.java +++ b/src/main/java/disMCbot.java @@ -1,29 +1,39 @@ - -import net.dv8tion.jda.api.JDABuilder; -import net.dv8tion.jda.api.entities.TextChannel; - -import javax.security.auth.login.LoginException; +import discord4j.core.DiscordClient; +import discord4j.core.DiscordClientBuilder; +import discord4j.core.event.domain.lifecycle.ReadyEvent; +import discord4j.core.event.domain.message.MessageCreateEvent; +import discord4j.core.object.presence.Activity; +import discord4j.core.object.presence.Presence; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import listeners.MinecraftEventListener; - public class disMCbot { - private static TextChannel updateChannel; private static final Logger logger = LogManager.getLogger(disMCbot.class); - public static void main(String[] args) throws LoginException { + public static void main(String[] args) { logger.info("Starting Discord Bot..."); String token = "MTIyNjY1NTgxODU0NDMxNjQxNw.GXAYvx.m2_ZmH-J5-iGhqdkW3M2VViG1wBQguKq-OjN80"; - JDABuilder builder = JDABuilder.createDefault(token); - builder.addEventListeners(new MinecraftEventListener(updateChannel)); - builder.build(); - } - public void setUpdateChannel(TextChannel channel) { - disMCbot.updateChannel = channel; - } + DiscordClient client = DiscordClientBuilder.create(token).build(); + client.login().block(); + client.getEventDispatcher().on(ReadyEvent.class) + .subscribe(ready -> { + System.out.println("Logged in as: " + ready.getSelf().getUsername()); + client.updatePresence(Presence.online(Activity.playing("Minecraft"))); + }); + + client.getEventDispatcher().on(MessageCreateEvent.class) + .subscribe(event -> { + String messageContent = event.getMessage().getContent(); + if (messageContent.equalsIgnoreCase("!ping")) { + event.getMessage().getChannel().block().createMessage("Pong!").block(); + } + // Add more commands as needed + }); + + client.onDisconnect().block(); + } // Other methods and event listeners can be added as needed -} \ No newline at end of file +} diff --git a/src/main/java/listeners/MinecraftEventListener.java b/src/main/java/listeners/MinecraftEventListener.java index fe306fb..0e95a8f 100644 --- a/src/main/java/listeners/MinecraftEventListener.java +++ b/src/main/java/listeners/MinecraftEventListener.java @@ -4,12 +4,13 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -import net.dv8tion.jda.api.entities.TextChannel; +import discord4j.core.object.entity.channel.TextChannel; + public class MinecraftEventListener implements Listener { - private final TextChannel updateChannel; // Discord channel to send updates + private final discord4j.core.object.entity.channel.TextChannel updateChannel; // Discord channel to send updates public MinecraftEventListener(TextChannel updateChannel) { this.updateChannel = updateChannel; @@ -18,12 +19,12 @@ public class MinecraftEventListener implements Listener { @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { String playerName = event.getPlayer().getName(); - updateChannel.sendMessage("Player " + playerName + " has joined the server.").queue(); + updateChannel.createMessage("Player " + playerName + " has joined the server."); } @EventHandler public void onPlayerQuit(PlayerQuitEvent event) { String playerName = event.getPlayer().getName(); - updateChannel.sendMessage("Player " + playerName + " has left the server.").queue(); + updateChannel.createMessage("Player " + playerName + " has left the server."); } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 40b4235..f34dbf8 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: MCdiscord_bot-1 -version: 1.1be02 +version: 1.1be04 main: MCdiscord_bot-1.src.main.java.disMCbot description: A Discord bot plugin for Minecraft. author: Bryce diff --git a/target/MCdiscord_bot-1.1be02.jar b/target/MCdiscord_bot-1.1be02.jar deleted file mode 100644 index 219d207..0000000 Binary files a/target/MCdiscord_bot-1.1be02.jar and /dev/null differ diff --git a/target/archive-tmp/MCdiscord_bot-1.1be02.jar b/target/archive-tmp/MCdiscord_bot-1.1be02.jar deleted file mode 100644 index 9f29a6b..0000000 Binary files a/target/archive-tmp/MCdiscord_bot-1.1be02.jar and /dev/null differ diff --git a/target/classes/disMCbot.class b/target/classes/disMCbot.class index bc5ee3d..c423f5f 100644 Binary files a/target/classes/disMCbot.class and b/target/classes/disMCbot.class differ diff --git a/target/classes/listeners/MinecraftEventListener.class b/target/classes/listeners/MinecraftEventListener.class index 5019f08..74f694f 100644 Binary files a/target/classes/listeners/MinecraftEventListener.class and b/target/classes/listeners/MinecraftEventListener.class differ diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index 40b4235..f34dbf8 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,5 +1,5 @@ name: MCdiscord_bot-1 -version: 1.1be02 +version: 1.1be04 main: MCdiscord_bot-1.src.main.java.disMCbot description: A Discord bot plugin for Minecraft. author: Bryce diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties deleted file mode 100644 index 69d19e0..0000000 --- a/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=MCdiscord_bot -groupId=com.example -version=1.1be02 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 86f1cd9..e69de29 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,2 +0,0 @@ -disMCbot.class -listeners\MinecraftEventListener.class