From 8f567ec4d6f9624700c87f62513e1849d023b381 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Sat, 3 Sep 2022 03:43:10 +0200
Subject: [PATCH] Made mcmmo all booster be stored as separate boosters to work
 with the queuing feature

---
 .../com/alttd/boosterapi/BoosterType.java     | 20 ++++++++++++++++
 .../vboosters/commands/BoosterCommand.java    | 24 ++++++++++++-------
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/api/src/main/java/com/alttd/boosterapi/BoosterType.java b/api/src/main/java/com/alttd/boosterapi/BoosterType.java
index 71aeb62..131aef0 100644
--- a/api/src/main/java/com/alttd/boosterapi/BoosterType.java
+++ b/api/src/main/java/com/alttd/boosterapi/BoosterType.java
@@ -1,5 +1,7 @@
 package com.alttd.boosterapi;
 
+import java.util.List;
+
 public enum BoosterType {
 
     /**
@@ -67,4 +69,22 @@ public enum BoosterType {
         return UNKNOWN;
     }
 
+    public static List<BoosterType> getAllMcMMOBoosters() {
+        return List.of(BoosterType.ACROBATICS,
+                BoosterType.ALCHEMY,
+                BoosterType.ARCHERY,
+                BoosterType.AXES,
+                BoosterType.EXCAVATION,
+                BoosterType.FISHING,
+                BoosterType.HERBALISM,
+                BoosterType.MINING,
+                BoosterType.REPAIR,
+                BoosterType.SALVAGE,
+                BoosterType.SMELTING,
+                BoosterType.SWORDS,
+                BoosterType.TAMING,
+                BoosterType.UNARMED,
+                BoosterType.WOODCUTTING);
+    }
+
 }
diff --git a/velocity/src/main/java/com/alttd/vboosters/commands/BoosterCommand.java b/velocity/src/main/java/com/alttd/vboosters/commands/BoosterCommand.java
index a2ccef9..5c40c84 100755
--- a/velocity/src/main/java/com/alttd/vboosters/commands/BoosterCommand.java
+++ b/velocity/src/main/java/com/alttd/vboosters/commands/BoosterCommand.java
@@ -7,6 +7,7 @@ import com.alttd.boosterapi.util.Utils;
 import com.alttd.proxydiscordlink.bot.api.DiscordSendMessage;
 import com.alttd.vboosters.VelocityBoosters;
 import com.alttd.vboosters.data.VelocityBooster;
+import com.alttd.vboosters.managers.BoosterManager;
 import com.alttd.vboosters.storage.VelocityBoosterStorage;
 import com.mojang.brigadier.arguments.DoubleArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
@@ -103,14 +104,14 @@ public class BoosterCommand {
                                                 BoosterType boosterType = BoosterType.getByName(context.getArgument("booster", String.class));
                                                 long duration = TimeUnit.MINUTES.toMillis(context.getArgument("time", Integer.class));
                                                 double multiplier = context.getArgument("multiplier", Double.class);
-                                                VelocityBoosters.getPlugin().getBoosterManager().addBooster(new VelocityBooster(boosterType, username, duration, multiplier));
-                                                long expiryTime = new Date().getTime() + duration;
-                                                String msg = "[" + username + "] activated booster of type [" + Utils.capitalize(boosterType.getBoosterName()) + "] until %date%."; //TODO check if there was a booster active already and change message based on that
-                                                DiscordSendMessage.sendEmbed(Config.BOOST_ANNOUNCE_CHANNEL, "Booster Activated", msg.replaceAll("%date%", "<t:" + expiryTime + ":f>"));
-                                                String mcMessage = msg.replaceAll("%date%", DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(expiryTime));
-                                                mcMessage += " [UTC]";
-                                                VelocityBoosters.getPlugin().getProxy().sendMessage(MiniMessage.markdown().parse(mcMessage));
-                                                VelocityBoosters.getPlugin().getLogger().info(mcMessage);
+                                                if (boosterType.equals(BoosterType.MCMMO))
+                                                    addAllMcMMOBoosters(username, duration, multiplier);
+                                                else
+                                                    VelocityBoosters.getPlugin().getBoosterManager().addBooster(new VelocityBooster(boosterType, username, duration, multiplier));
+                                                String msg = "[" + username + "] purchased booster of type [" + Utils.capitalize(boosterType.getBoosterName()) + "]"; //TODO check if there was a booster active already and change message based on that
+                                                DiscordSendMessage.sendEmbed(Config.BOOST_ANNOUNCE_CHANNEL, "Booster Purchased", msg);
+                                                VelocityBoosters.getPlugin().getProxy().sendMessage(MiniMessage.markdown().parse(msg));
+                                                VelocityBoosters.getPlugin().getLogger().info(msg);
                                                 return 1;
                                             })
                                         )
@@ -128,4 +129,11 @@ public class BoosterCommand {
 
         proxyServer.getCommandManager().register(meta, brigadierCommand);
     }
+
+    private void addAllMcMMOBoosters(String username, long duration, double multiplier) {
+        BoosterManager boosterManager = VelocityBoosters.getPlugin().getBoosterManager();
+        for (BoosterType boosterType : BoosterType.getAllMcMMOBoosters()) {
+            boosterManager.addBooster(new VelocityBooster(boosterType, username, duration, multiplier));
+        }
+    }
 }