diff --git a/MCdiscord_bot-1.jar b/MCdiscord_bot-1.jar index ccc89c7..72f903a 100644 Binary files a/MCdiscord_bot-1.jar and b/MCdiscord_bot-1.jar differ diff --git a/pom.xml b/pom.xml index 8a3a415..6e09341 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,8 @@ 4.0.0 com.example - minecraft-chatbot - 1.0 + MCdiscord_bot + 1.1be01 jar @@ -21,9 +21,28 @@ 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 + + + + + org.bukkit + bukkit + 1.15.2-R0.1-SNAPSHOT + provided + org.spigotmc @@ -46,7 +65,12 @@ tritonus tritonus-dsp + + club.minnced + opus-java + + compile @@ -78,31 +102,49 @@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.3.0 + + + + src/main/resources + + **/*.yml + + + + + jar-with-dependencies + + + + disMCbot + + + . + + + false + ${project.artifactId}-${project.version} + + plugin.yml + + + - - - - 3.0 - - - 21 - 21 - - --enable-preview - - + make-assembly + package + + single + - - - - + + + + \ No newline at end of file diff --git a/src/main/java/disMCbot.java b/src/main/java/disMCbot.java index 5edccd8..a01b6e9 100644 --- a/src/main/java/disMCbot.java +++ b/src/main/java/disMCbot.java @@ -1,68 +1,29 @@ + import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.entities.TextChannel; -import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import javax.annotation.Nonnull; import javax.security.auth.login.LoginException; -import org.apache.logging.log4j.*; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import listeners.MinecraftEventListener; -public class disMCbot extends ListenerAdapter { - - private TextChannel updateChannel; // Define the channel where updates will be posted - +public class disMCbot { + private static TextChannel updateChannel; private static final Logger logger = LogManager.getLogger(disMCbot.class); public static void main(String[] args) throws LoginException { - logger.info("Starting Discord Comms..."); - JDABuilder builder = JDABuilder - .createDefault("MTIyNjY1NTgxODU0NDMxNjQxNw.GALTlL.vPRJyKTEJNqN1Snfj5G-_2306lBKFdOYB1eDXE"); - builder.addEventListeners(new disMCbot()); + 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(); } - @Override - public void onMessageReceived(@Nonnull MessageReceivedEvent event) { - if (event.getAuthor().isBot()) return; // Ignore messages from bots - - String message = event.getMessage().getContentRaw(); - // Check for conditions or events triggering updates - if (message.contains("Player1 died")) { - // Log It - logger.info("Player1 died - detected"); - // Post update to the specified channel - if (updateChannel != null) { - updateChannel.sendMessage("Player1 has died in Minecraft!").queue(); - // Log It - logger.info("Message Posted in Discord."); - } - } else if (message.contains("Player1 Exp")) { - // Log It - logger.info("Player1 Exp Gained"); - // Post another type of update - if (updateChannel != null) { - updateChannel.sendMessage("Player1 gained experience in Minecraft!").queue(); - // Log It - logger.info("Message sent to Discord."); - } - } else if (message.contains("drowned")) { - // Log It - logger.info("Player1 has drowned"); - // Post another type of update - if (updateChannel != null) { - updateChannel.sendMessage("Player1 has drowned - they got thirsty!").queue(); - // Log It - logger.info("Message sent to Discord."); - } - } + public void setUpdateChannel(TextChannel channel) { + disMCbot.updateChannel = channel; } - public void setUpdateChannel(TextChannel channel) { - this.updateChannel = channel; - } - -} - - \ No newline at end of file + // 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 new file mode 100644 index 0000000..fe306fb --- /dev/null +++ b/src/main/java/listeners/MinecraftEventListener.java @@ -0,0 +1,29 @@ +package listeners; + +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; + + +public class MinecraftEventListener implements Listener { + + private final TextChannel updateChannel; // Discord channel to send updates + + public MinecraftEventListener(TextChannel updateChannel) { + this.updateChannel = updateChannel; + } + + @EventHandler + public void onPlayerJoin(PlayerJoinEvent event) { + String playerName = event.getPlayer().getName(); + updateChannel.sendMessage("Player " + playerName + " has joined the server.").queue(); + } + + @EventHandler + public void onPlayerQuit(PlayerQuitEvent event) { + String playerName = event.getPlayer().getName(); + updateChannel.sendMessage("Player " + playerName + " has left the server.").queue(); + } +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..a06eaa0 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,29 @@ +name: MCdiscord_bot-1 +version: 1.1be01 +main: MCdiscord_bot-1.src.main.java.disMCbot +description: A Discord bot plugin for Minecraft. +author: Bryce +api-version: 1.20.4 +depend: [JDA] + +# Listener Configuration +listeners: + - MCdiscordbot-1.src.main.java.listeners.MinecraftEventListener + +# Discord Bot Configuration +discord: + token: "MTIyNjY1NTgxODU0NDMxNjQxNw.GXAYvx.m2_ZmH-J5-iGhqdkW3M2VViG1wBQguKq-OjN80" + server: + id: "710784165460836402" + name: "Bryce & Evee's Community Server" + channel: "1226860741592743977" + logChannel: "1226860741592743977" + +# Minecraft Event Settings +minecraft: + events: + - type: playerJoin + discordChannel: "mc_bot-spam" + - type: playerQuit + discordChannel: "mc_bot-spam" + # Add more event types and their corresponding Discord channels as needed diff --git a/target/MCdiscord_bot-1.1be01.jar b/target/MCdiscord_bot-1.1be01.jar new file mode 100644 index 0000000..ed145df Binary files /dev/null and b/target/MCdiscord_bot-1.1be01.jar differ diff --git a/target/archive-tmp/MCdiscord_bot-1.1be01.jar b/target/archive-tmp/MCdiscord_bot-1.1be01.jar new file mode 100644 index 0000000..4cd703b Binary files /dev/null and b/target/archive-tmp/MCdiscord_bot-1.1be01.jar differ diff --git a/target/classes/disMCbot.class b/target/classes/disMCbot.class index 0d1efd1..bc5ee3d 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 new file mode 100644 index 0000000..5019f08 Binary files /dev/null and b/target/classes/listeners/MinecraftEventListener.class differ diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml new file mode 100644 index 0000000..a06eaa0 --- /dev/null +++ b/target/classes/plugin.yml @@ -0,0 +1,29 @@ +name: MCdiscord_bot-1 +version: 1.1be01 +main: MCdiscord_bot-1.src.main.java.disMCbot +description: A Discord bot plugin for Minecraft. +author: Bryce +api-version: 1.20.4 +depend: [JDA] + +# Listener Configuration +listeners: + - MCdiscordbot-1.src.main.java.listeners.MinecraftEventListener + +# Discord Bot Configuration +discord: + token: "MTIyNjY1NTgxODU0NDMxNjQxNw.GXAYvx.m2_ZmH-J5-iGhqdkW3M2VViG1wBQguKq-OjN80" + server: + id: "710784165460836402" + name: "Bryce & Evee's Community Server" + channel: "1226860741592743977" + logChannel: "1226860741592743977" + +# Minecraft Event Settings +minecraft: + events: + - type: playerJoin + discordChannel: "mc_bot-spam" + - type: playerQuit + discordChannel: "mc_bot-spam" + # Add more event types and their corresponding Discord channels as needed diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 81ca31f..6757f6f 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,3 +1,3 @@ -artifactId=minecraft-chatbot +artifactId=MCdiscord_bot groupId=com.example -version=1.0 +version=1.1be01 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 120ab50..86f1cd9 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 +1,2 @@ disMCbot.class +listeners\MinecraftEventListener.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 37aeecf..b35812d 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1 +1,2 @@ C:\Users\hbmann\Documents\Projects\_MCdiscord-bot\MCdiscord_bot-1\src\main\java\disMCbot.java +C:\Users\hbmann\Documents\Projects\_MCdiscord-bot\MCdiscord_bot-1\src\main\java\listeners\MinecraftEventListener.java diff --git a/target/minecraft-chatbot-1.0.jar b/target/minecraft-chatbot-1.0.jar deleted file mode 100644 index 8b1e52c..0000000 Binary files a/target/minecraft-chatbot-1.0.jar and /dev/null differ