Modified the API to use the new modification services

Author: ncurran02

server/src/main/java/dev/plex/command/impl/BanCMD.java

@@ -28,7 +28,6 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.prism_mc.prism.api.activities.Activity;
 import org.prism_mc.prism.api.activities.ActivityQuery;
 import org.prism_mc.prism.paper.api.PrismPaperApi;
 import org.prism_mc.prism.paper.api.activities.PaperActivityQuery;
@@ -99,24 +98,28 @@ protected Component execute(@NotNull CommandSender sender, @Nullable Player play
                 if (plugin.getPrismHook() != null && plugin.getPrismHook().hasPrism())
                 {
                     PrismPaperApi prism = plugin.getPrismHook().getPrism();
-                    Bukkit.getAsyncScheduler().runNow(plugin, task ->
-                    {
-                        try
-                        {
-                            ActivityQuery query = PaperActivityQuery.builder()
-                                    .actionTypeKeys(Arrays.asList("block-place", "block-break", "block-burn", "entity-spawn", "entity-kill", "entity-explode"))
-                                    .causePlayerName(plexPlayer.getName())
-                                    .before(Instant.now().getEpochSecond())
-                                    .rollback()
-                                    .build();
-
-                            List<Activity> activities = prism.storageAdapter().queryActivities(query);
-                            PlexLog.debug("{0} activities have been rollback", activities.size());
+                    ActivityQuery query = PaperActivityQuery.builder()
+                            .actionTypeKeys(Arrays.asList("block-place", "block-break", "block-burn", "entity-spawn", "entity-kill", "entity-explode"))
+                            .causePlayerName(plexPlayer.getName())
+                            .before(Instant.now().getEpochSecond())
+                            .rollback()
+                            .build();
+                    prism.rollback(sender, query).whenCompleteAsync((result, error) -> {
+                        if (error != null) {
+                            send(sender, messageComponent("prismRollbackError", error.getMessage()));
+                            PlexLog.error("Unable to rollback: {0}", error);
+                            return;
                         }
-                        catch (Exception ex)
-                        {
-                            PlexLog.error("Unable to query activities: {0}", ex);
+
+                        int count = result.applied();
+                        if (count == 0) {
+                            send(sender, messageComponent("prismNoResult", count));
+                            PlexLog.debug("No activities are available to rollback");
+                            return;
                         }
+
+                        send(sender, messageComponent("prismRollbackMessage", count));
+                        PlexLog.debug("Rolled back {0} activities", count);
                     });
                 }
                 else if (plugin.getCoreProtectHook() != null && plugin.getCoreProtectHook().hasCoreProtect())

server/src/main/resources/messages.yml

@@ -279,4 +279,9 @@ reappliedGamerules: "<aqua>All game rules have been re-applied!"
 commandNotFound: "<red>That command could not be found!"
 # 0 - The command
 # 1 - A list of aliases found
-commandAliases: "<aqua>Aliases for {0} are: {1}"
+commandAliases: "<aqua>Aliases for {0} are: {1}"
+# 0 - Number of activities found to rollback
+prismRollbackMessage: "<gray>Rolled back {0} activities"
+# 0 - Error message returned from Prism
+prismRollbackError: "<red>Rollback failed: {0}"
+prismNoResult: "<gray>No activities have been rolled back"