Show position and time for advancement and change discord library

Author: UnknownSilicon

pom.xml

@@ -73,6 +73,11 @@
             <id>papermc</id>
             <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
+        <repository>
+            <id>jcenter</id>
+            <name>jcenter-bintray</name>
+            <url>https://jcenter.bintray.com</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -100,9 +105,15 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.discord4j</groupId>
-            <artifactId>discord4j-core</artifactId>
-            <version>3.1.3</version>
+            <groupId>net.dv8tion</groupId>
+            <artifactId>JDA</artifactId>
+            <version>4.2.0_242</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>club.minnced</groupId>
+                    <artifactId>opus-java</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>

src/main/java/parallelmc/parallelutils/Parallelutils.java

@@ -25,6 +25,7 @@
 import parallelmc.parallelutils.discordintegration.BotManager;
 import parallelmc.parallelutils.discordintegration.DiscordIntegrationEventRegistrar;
 
+import javax.security.auth.login.LoginException;
 import java.sql.*;
 import java.util.UUID;
 import java.util.logging.Level;
@@ -180,9 +181,14 @@ public void onEnable() {
 		CustomMobsEventRegistrar.registerEvents();
 
 		// Register Events for the DiscordIntegration Module
-		BotManager manager = new BotManager(token);
-		manager.addChannel("staff", staffChannel);
-		DiscordIntegrationEventRegistrar.registerEvents();
+		BotManager manager = null;
+		try {
+			manager = new BotManager(token);
+			manager.addChannel("staff", staffChannel);
+			DiscordIntegrationEventRegistrar.registerEvents();
+		} catch (LoginException e) {
+			Parallelutils.log(Level.SEVERE, "Unable to initialize BotManager. Is the token valid?");
+		}
 
 		// Setup commands
 		Commands commands = new Commands(this);

src/main/java/parallelmc/parallelutils/discordintegration/AdvancementListener.java

@@ -1,11 +1,14 @@
 package parallelmc.parallelutils.discordintegration;
 
+import org.bukkit.Location;
+import org.bukkit.Statistic;
 import org.bukkit.advancement.Advancement;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerAdvancementDoneEvent;
 import parallelmc.parallelutils.Parallelutils;
+import parallelmc.parallelutils.util.TimeTools;
 
 import java.util.Arrays;
 import java.util.List;
@@ -29,22 +32,31 @@ public class AdvancementListener implements Listener {
 	public void onAch(PlayerAdvancementDoneEvent event) {
 		Player player = event.getPlayer();
 
+		Location playerLocation = player.getLocation();
+
+		int playtime = player.getStatistic(Statistic.PLAY_ONE_MINUTE); // Ticks played
+
+		String fulltime = TimeTools.fullTime(playtime, TimeTools.TimeUnit.TICKS);
+
 		Advancement advancement = event.getAdvancement();
 
-		// player.sendMessage("Player " + player.getName() + " got advancement " + advancement.getKey().toString());
+		Parallelutils.log(Level.INFO,"Player " + player.getName() + " got advancement " + advancement.getKey().toString());
 
 		if (SPECIAL_ADVANCEMENTS.contains(advancement.getKey().toString())) {
 			if (BotManager.getInstance() != null) {
 				if (!BotManager.getInstance().sendMessage("staff",
-						"Player " + player.getName() + " got advancement " + advancement.getKey().getKey())) {
+						"Player " + player.getName() + " got advancement " + advancement.getKey().getKey() + "." +
+								" They are at " + playerLocation.toString() + " and have " + fulltime + " of playtime")) {
 					Parallelutils.log(Level.WARNING, "Unable to send message. Unknown error.");
 					Parallelutils.log(Level.WARNING,
-							"Player " + player.getName() + " got advancement " + advancement.getKey().getKey());
+							"Player " + player.getName() + " got advancement " + advancement.getKey().getKey() + "." +
+									" They are at " + playerLocation.toString() + " and have " + fulltime + " of playtime");
 				}
 			} else {
 				Parallelutils.log(Level.WARNING, "BotManager not initialized. Can't send message!");
 				Parallelutils.log(Level.WARNING,
-						"Player " + player.getName() + " got advancement " + advancement.getKey().getKey());
+						"Player " + player.getName() + " got advancement " + advancement.getKey().getKey() + "." +
+								" They are at " + playerLocation.toString() + " and have " + fulltime + " of playtime");
 			}
 		}
 	}

src/main/java/parallelmc/parallelutils/discordintegration/BotManager.java

@@ -1,12 +1,14 @@
 package parallelmc.parallelutils.discordintegration;
 
-import discord4j.common.util.Snowflake;
-import discord4j.core.DiscordClient;
-import discord4j.rest.entity.RestChannel;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.events.ReadyEvent;
+import net.dv8tion.jda.api.hooks.EventListener;
 import parallelmc.parallelutils.Parallelutils;
 
 import javax.annotation.Nullable;
-import java.time.Duration;
+import javax.security.auth.login.LoginException;
 import java.util.HashMap;
 import java.util.logging.Level;
 
@@ -15,19 +17,27 @@
  */
 public class BotManager {
 
-	private final DiscordClient client;
+	private final JDA client;
 	private final HashMap<String, String> channels;
 
 	private final int NUM_TRIES = 5;
 
+	private boolean ready = false;
+
 	private static BotManager manager;
 
 	/**
 	 * Instantiate a new BotManager with the given Discord bot token
+	 *
 	 * @param token The Discord bot token
 	 */
-	public BotManager(String token) {
-		client = DiscordClient.create(token);
+	public BotManager(String token) throws LoginException {
+		client = JDABuilder.createDefault(token).addEventListeners((EventListener) event -> {
+			if (event instanceof ReadyEvent) {
+				ready = true;
+				Parallelutils.log(Level.INFO, "JDA Ready");
+			}
+		}).build();
 		channels = new HashMap<>();
 
 		if (manager == null) {
@@ -37,6 +47,7 @@ public BotManager(String token) {
 
 	/**
 	 * Returns the singleton instance of BotManager
+	 *
 	 * @return The instance
 	 */
 	@Nullable
@@ -46,35 +57,32 @@ public static BotManager getInstance() {
 
 	/**
 	 * Add a channel and ID pair to the map of channels. This is used to assign useful names to channel ids in code
+	 *
 	 * @param name The assigned name for the channel id pair
-	 * @param id The id of the channel
+	 * @param id   The id of the channel
 	 */
 	public void addChannel(String name, String id) {
 		channels.put(name, id);
 	}
 
 	/**
 	 * Sends a message in the specified channel
+	 *
 	 * @param channel The shortname of the channel to send a message to
 	 * @param message The message that is being sent
 	 * @return Returns true if the message was sent successfully, false otherwise
 	 */
 	public boolean sendMessage(String channel, String message) {
-		RestChannel restChannel = client.getChannelById(Snowflake.of(channels.get(channel)));
-
+		Parallelutils.log(Level.INFO, "Attempting to send a message");
 		boolean success = false;
-
-		for (int i = 0; i < NUM_TRIES; i++) {
-			try {
-				restChannel.createMessage(message).block(Duration.ofSeconds(2));
-			} catch (Exception e) {
-				Parallelutils.log(Level.INFO, "Failed to send message. Trying again.");
-				continue;
+		if (ready) {
+			TextChannel textChannel = client.getTextChannelById(channels.get(channel));
+			if (textChannel != null) {
+				textChannel.sendMessage(message).queue();
+				success = true;
 			}
-			success = true;
-			break;
 		}
 
-		return success;
+		return success; // Yes this is dumb, no I'm not changing it. It's an artifact of old code
 	}
 }

src/main/java/parallelmc/parallelutils/util/TimeTools.java

@@ -0,0 +1,66 @@
+package parallelmc.parallelutils.util;
+
+public class TimeTools {
+
+	public enum TimeUnit {
+		TICKS(0, 1, "t"),
+		SECONDS(1, 20, "s"),
+		MINUTES(2, 20*60, "m"),
+		HOURS(3, 20*60*60, "h"),
+		DAYS(4, 20*60*60*24, "d");
+
+		public int index;
+		public int ticks;
+		public String val;
+
+		TimeUnit(int index, int ticks, String s) {
+			this.index = index;
+			this.ticks = ticks;
+			val = s;
+		}
+	}
+
+	/**
+	 * Converts the given time from one unit to another
+	 * @param time The time to convert
+	 * @param original The unit of {@param time}
+	 * @param end The unit to convert to
+	 * @return The converted time
+	 */
+	public static double convertTime(double time, TimeUnit original, TimeUnit end) {
+		return (time*(double)original.ticks)/(double)end.ticks;
+	}
+
+	/**
+	 * Converts the given time in the given unit to a full form.
+	 * Example: 64d 5h 2m 50s 10t
+	 * @param time The starting time
+	 * @param unit The unit the starting time is in
+	 * @return The full time
+	 */
+	public static String fullTime(double time, TimeUnit unit) {
+		String fulltime = "";
+
+		// Convert to days
+		double days = convertTime(time, unit, TimeUnit.DAYS);
+		int daysInt = (int)days;
+		fulltime += daysInt + TimeUnit.DAYS.val + " ";
+
+		double hours = convertTime(days-daysInt, TimeUnit.DAYS, TimeUnit.HOURS);
+		int hoursInt = (int)hours;
+		fulltime += hoursInt + TimeUnit.HOURS.val + " ";
+
+		double minutes = convertTime(hours-hoursInt, TimeUnit.HOURS, TimeUnit.MINUTES);
+		int minutesInt = (int)minutes;
+		fulltime += minutesInt + TimeUnit.MINUTES.val + " ";
+
+		double seconds = convertTime(minutes-minutesInt, TimeUnit.MINUTES, TimeUnit.SECONDS);
+		int secondsInt = (int) seconds;
+		fulltime += secondsInt + TimeUnit.SECONDS.val + " ";
+
+		double ticks = convertTime(seconds-secondsInt, TimeUnit.SECONDS, TimeUnit.TICKS);
+		fulltime += (int)ticks + TimeUnit.TICKS.val;
+
+		return fulltime;
+	}
+}