diff --git a/.vscode/settings.json b/.vscode/settings.json index 7b016a8..75c49d6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "java.compile.nullAnalysis.mode": "automatic" + "java.compile.nullAnalysis.mode": "automatic", + "java.dependency.packagePresentation": "hierarchical" } \ No newline at end of file diff --git a/MCdiscord_bot-1.jar b/MCdiscord_bot-1.jar index 5a9dda1..7cbbe7a 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 index eba75a8..5f40479 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.example MCdiscord_bot - 1.1be04 + 1.1be06 @@ -18,19 +18,33 @@ - net.dv8tion:JDA + com.discord4j - net.dv8tion - com.example.MCdiscordbot.shaded.net.dv8tion + club.minced + com.example.MCdiscordbot.shaded.club.minced + + maven-dependency-plugin + 3.2.0 + + + analyze-dependencies + validate + + analyze-only + + + + + @@ -48,11 +62,6 @@ jcenter-bintray https://jcenter.bintray.com - - discordJDA - JDA for Discord - https://github.com/DV8FromTheWorld/JDA - @@ -79,15 +88,9 @@ 2.23.1 compile - - net.katsstuff - ackcord-data_sjs1_2.13 - 2.0.0.0-M1 - compile - - 21 - 21 + 22 + 22 diff --git a/pom.xml b/pom.xml index 0e1068c..e5a4ba6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ com.example MCdiscord_bot - 1.1be04 + 1.1be06 jar - 21 - 21 + 22 + 22 @@ -53,7 +53,7 @@ com.discord4j discord4j-core - 3.3.0-RC1 + 3.2.6 @@ -71,14 +71,7 @@ - - - net.katsstuff - ackcord-data_sjs1_2.13 - 2.0.0.0-M1 - - - + @@ -96,7 +89,7 @@ - club.minced.discord4j + com.discord4j @@ -109,8 +102,23 @@ - + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + + + analyze-dependencies + validate + + analyze-only + + + + + + + - \ No newline at end of file diff --git a/src/main/java/disMCbot.java b/src/main/java/disMCbot.java index 3ddbd9d..a807ba5 100644 --- a/src/main/java/disMCbot.java +++ b/src/main/java/disMCbot.java @@ -1,9 +1,8 @@ -import discord4j.core.DiscordClient; +import discord4j.core.GatewayDiscordClient; 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 discord4j.core.object.presence.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -15,13 +14,13 @@ public class disMCbot { logger.info("Starting Discord Bot..."); String token = "MTIyNjY1NTgxODU0NDMxNjQxNw.GXAYvx.m2_ZmH-J5-iGhqdkW3M2VViG1wBQguKq-OjN80"; - DiscordClient client = DiscordClientBuilder.create(token).build(); - client.login().block(); + GatewayDiscordClient client = DiscordClientBuilder.create(token).build().gateway().login().block(); + + client.updatePresence(ClientPresence.online(ClientActivity.playing("Crafty Minecraft"))).subscribe(); 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) @@ -33,7 +32,8 @@ public class disMCbot { // Add more commands as needed }); - client.onDisconnect().block(); + client.onDisconnect().subscribe(); + } // Other methods and event listeners can be added as needed } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index f34dbf8..9286bb3 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,10 +1,9 @@ -name: MCdiscord_bot-1 -version: 1.1be04 +name: ZZ_MCdiscord_bot-1 +version: 1.1be06 main: MCdiscord_bot-1.src.main.java.disMCbot -description: A Discord bot plugin for Minecraft. +description: A Discord bot plugin for Crafty Minecraft. author: Bryce api-version: 1.20.4 -depend: [JDA] # Listener Configuration listeners: diff --git a/target/MCdiscord_bot-1.1be06.jar b/target/MCdiscord_bot-1.1be06.jar new file mode 100644 index 0000000..2aecbb6 Binary files /dev/null and b/target/MCdiscord_bot-1.1be06.jar differ diff --git a/target/classes/disMCbot.class b/target/classes/disMCbot.class index c423f5f..f5bb156 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 74f694f..839dab2 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 f34dbf8..9286bb3 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,10 +1,9 @@ -name: MCdiscord_bot-1 -version: 1.1be04 +name: ZZ_MCdiscord_bot-1 +version: 1.1be06 main: MCdiscord_bot-1.src.main.java.disMCbot -description: A Discord bot plugin for Minecraft. +description: A Discord bot plugin for Crafty Minecraft. author: Bryce api-version: 1.20.4 -depend: [JDA] # Listener Configuration listeners: diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..ad6eec4 --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=MCdiscord_bot +groupId=com.example +version=1.1be06 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 e69de29..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 @@ -0,0 +1,2 @@ +disMCbot.class +listeners\MinecraftEventListener.class diff --git a/target/original-MCdiscord_bot-1.1be06.jar b/target/original-MCdiscord_bot-1.1be06.jar new file mode 100644 index 0000000..723378c Binary files /dev/null and b/target/original-MCdiscord_bot-1.1be06.jar differ