Merge remote-tracking branch 'origin/master'

Author: MikeTheShadow

src/main/java/com/miketheshadow/complexproficiencies/Boosters/BoosterNBT.java

@@ -0,0 +1,48 @@
+package com.miketheshadow.complexproficiencies.Boosters;
+
+import de.tr7zw.nbtapi.NBTItem;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BoosterNBT {
+
+    public static boolean isBooster(NBTItem item) {
+        return item.hasKey("boost");
+    }
+
+    public static double getBoost(NBTItem item) {
+        return item.getDouble("boost");
+    }
+
+    public static int getTime(NBTItem item) {
+        return item.getInteger("time");
+    }
+
+    public static NBTItem createBoosterItem(NBTItem item, double boost, int minutes) {
+        item.setDouble("boost", boost);
+        item.setInteger("time", minutes);
+        return item;
+    }
+
+    public static ItemStack createBoosterItemStack(double boost, int minutes) {
+        ItemStack stack = new ItemStack(Material.EXP_BOTTLE);
+        ItemMeta meta = stack.getItemMeta();
+        meta.setDisplayName(ChatColor.GREEN + "Global XP Booster");
+        meta.setLore(createBoosterLore(boost, minutes));
+        return stack;
+    }
+
+    public static List<String> createBoosterLore(double boost, int minutes) {
+        List<String> lore = new ArrayList<>();
+        String multiplierString = ChatColor.BLUE + "Multiplier: " + ChatColor.WHITE + boost;
+        String durationString = ChatColor.BLUE + "Duration: " + ChatColor.WHITE + minutes + " Minute(s)";
+        lore.add(multiplierString);
+        lore.add(durationString);
+        return lore;
+    }
+}

src/main/java/com/miketheshadow/complexproficiencies/Boosters/BoosterTask.java

@@ -0,0 +1,21 @@
+package com.miketheshadow.complexproficiencies.Boosters;
+
+import com.miketheshadow.complexproficiencies.ComplexProficiencies;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.scheduler.BukkitRunnable;
+
+public class BoosterTask extends BukkitRunnable {
+
+    private final double boost;
+
+    public BoosterTask(ComplexProficiencies complexProficiencies, double boost) {
+        this.boost = boost;
+    }
+
+    @Override
+    public void run() {
+        BoosterUtil.decreaseBoost(boost);
+        Bukkit.broadcastMessage(ChatColor.WHITE + "" + boost + "x Boost " + ChatColor.GREEN + "has ended.");
+    }
+}

src/main/java/com/miketheshadow/complexproficiencies/Boosters/BoosterUtil.java

@@ -0,0 +1,45 @@
+package com.miketheshadow.complexproficiencies.Boosters;
+
+import com.miketheshadow.complexproficiencies.ComplexProficiencies;
+import de.tr7zw.nbtapi.NBTItem;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.scheduler.BukkitTask;
+
+public class BoosterUtil {
+
+    static ComplexProficiencies complexProficiencies = ComplexProficiencies.INSTANCE;
+
+    public static void runBooster(ComplexProficiencies complexProficiencies, ItemStack stack, NBTItem item) {
+        double boost = BoosterNBT.getBoost(item);
+        int time = BoosterNBT.getTime(item);
+
+        increaseBoost(boost);
+
+        BukkitTask task = new BoosterTask(complexProficiencies, boost).runTaskLater(complexProficiencies, time * 1200L);
+        Bukkit.broadcastMessage(ChatColor.WHITE + "" + boost + "x Boost "
+                + ChatColor.GREEN + "has been enabled for "
+                + ChatColor.WHITE + (time) + " Minute(s)!");
+    }
+
+    public static void increaseBoost(double boost) {
+        double currentBoost = ComplexProficiencies.boost;
+        if (currentBoost == 1) {
+            ComplexProficiencies.boost = boost;
+        } else {
+            ComplexProficiencies.boost = currentBoost + boost;
+        }
+    }
+
+    public static void decreaseBoost(double boost) {
+        double newBoost = ComplexProficiencies.boost - boost;
+        ComplexProficiencies.boost = Math.max(newBoost, 1);
+    }
+
+    public static void setBoost(double boost, int time) {
+        ComplexProficiencies.boost = boost;
+        if (time < 1) return;
+        BukkitTask task = new BoosterTask(complexProficiencies, boost).runTaskLater(complexProficiencies, time * 1200L);
+    }
+}

src/main/java/com/miketheshadow/complexproficiencies/ComplexProficiencies.java

@@ -65,6 +65,9 @@ public class ComplexProficiencies extends JavaPlugin {
     //version
     public static String VERSION = "3.1.1";
 
+    //XP Booster
+    public static double boost;
+
     //economy
     public static Economy econ;
 
@@ -94,6 +97,9 @@ public void onEnable() {
             Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "WARNING RESET MODE IS ENABLED! PLEASE DISABLE IN THE CONFIG IF THIS WAS NOT INTENDED!");
         }
 
+        //XP Booster
+        boost = 1;
+
         //Duels
         duelsApi = (Duels) Bukkit.getServer().getPluginManager().getPlugin("Duels");
 
@@ -106,6 +112,7 @@ public void onEnable() {
         pluginManager.registerEvents(new EntityDeathListener(),this);
         pluginManager.registerEvents(new PlayerVehicleListener(),this);
         pluginManager.registerEvents(new PlayerCraftListener(),this);
+        pluginManager.registerEvents(new PlayerInteractListener(), this);
         //regrade listener
         pluginManager.registerEvents(new OpenRegradeWindowListener(),this);
         pluginManager.registerEvents(new RegradeInventoryListener(),this);
@@ -128,6 +135,10 @@ public void onEnable() {
         new SetLevelCommand();
         new AddExperienceCommand();
         new AddPartyExperienceCommand();
+        //booster commands
+        new SetBoostCommand();
+        new ClearBoostCommand();
+        new CreateBoosterCommand();
         //Only command that needs to be registered goes here
         new ComplexDebugCommand();
         new ComplexRecipeCommand();

src/main/java/com/miketheshadow/complexproficiencies/command/experience/ClearBoostCommand.java

@@ -0,0 +1,23 @@
+package com.miketheshadow.complexproficiencies.command.experience;
+
+import com.miketheshadow.complexproficiencies.command.ComplexCommand;
+import com.miketheshadow.complexproficiencies.Boosters.BoosterUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+public class ClearBoostCommand extends ComplexCommand {
+
+    public ClearBoostCommand() {
+        super("ClearBoost");
+    }
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.command.Command cmd, @NotNull String label, String[] args) {
+        if (cmd.getName().equalsIgnoreCase("ClearBoost")) {
+            BoosterUtil.setBoost(1, 0);
+            sender.sendMessage(ChatColor.GREEN + "The Global Boost has been reset.");
+        }
+        return true;
+    }
+}

src/main/java/com/miketheshadow/complexproficiencies/command/experience/CreateBoosterCommand.java

@@ -0,0 +1,46 @@
+package com.miketheshadow.complexproficiencies.command.experience;
+
+import com.miketheshadow.complexproficiencies.command.ComplexCommand;
+import com.miketheshadow.complexproficiencies.Boosters.BoosterNBT;
+import de.tr7zw.nbtapi.NBTItem;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Optional;
+
+public class CreateBoosterCommand extends ComplexCommand {
+
+    public CreateBoosterCommand() {
+        super("CreateBooster");
+    }
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.command.Command cmd, @NotNull String label, String[] args) {
+        if (!(sender instanceof Player)) {
+            sender.sendMessage(ChatColor.RED + "This command cannot be executed from console");
+            return true;
+        }
+        if (cmd.getName().equalsIgnoreCase("CreateBooster")) {
+            Player player = (Player) sender;
+            try {
+                double boost = Double.parseDouble(args[0]);
+                Optional<Integer> time = Optional.of(Integer.parseInt(args[1]));
+                NBTItem item = BoosterNBT.createBoosterItem(new NBTItem(BoosterNBT.createBoosterItemStack(boost, time.get())), boost, time.get());
+                ItemStack booster = item.getItem();
+                Inventory inventory = player.getInventory();
+                HashMap<Integer, ItemStack> hashmap = inventory.addItem(booster);
+                if (hashmap.isEmpty()) return true;
+                player.sendMessage(ChatColor.RED + "Not enough space in inventory.");
+
+            } catch (Exception Ignored) {
+                sender.sendMessage(ChatColor.RED + "Illegal Arguments!");
+            }
+        }
+        return false;
+    }
+}

src/main/java/com/miketheshadow/complexproficiencies/command/experience/SetBoostCommand.java

@@ -0,0 +1,34 @@
+package com.miketheshadow.complexproficiencies.command.experience;
+
+import com.miketheshadow.complexproficiencies.command.ComplexCommand;
+import com.miketheshadow.complexproficiencies.Boosters.BoosterUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+
+public class SetBoostCommand extends ComplexCommand {
+
+    public SetBoostCommand() {
+        super("SetBoostCommand");
+    }
+
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.command.Command cmd, @NotNull String label, String[] args) {
+        if (cmd.getName().equalsIgnoreCase("SetBoost")) {
+            double boost;
+            Optional<Integer> time;
+            try {
+                boost = Double.parseDouble(args[0]);
+                time = Optional.of(Integer.parseInt(args[1]));
+                if (boost < 0 || boost > 1.5) {
+                    sender.sendMessage(ChatColor.RED + "The boost must be between 0 or 1.5");
+                }
+                BoosterUtil.setBoost(boost, time.get());
+            } catch(Exception Ignored) {
+                sender.sendMessage("Illegal Arguments!");
+            }
+        }
+        return true;
+    }
+}

src/main/java/com/miketheshadow/complexproficiencies/listener/PlayerInteractListener.java

@@ -0,0 +1,38 @@
+package com.miketheshadow.complexproficiencies.listener;
+
+import com.miketheshadow.complexproficiencies.ComplexProficiencies;
+import com.miketheshadow.complexproficiencies.Boosters.BoosterNBT;
+import com.miketheshadow.complexproficiencies.Boosters.BoosterUtil;
+import de.tr7zw.nbtapi.NBTItem;
+import org.bukkit.ChatColor;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
+
+public class PlayerInteractListener implements Listener {
+
+    ComplexProficiencies complexProficiencies = ComplexProficiencies.INSTANCE;
+    double boost = ComplexProficiencies.boost;
+
+    @EventHandler
+    public void onPlayerInteractEvent(PlayerInteractEvent event) {
+        if (event.hasItem()) {
+            Player player = event.getPlayer();
+            ItemStack stack = event.getItem();
+            NBTItem item = new NBTItem(stack);
+            if (BoosterNBT.isBooster(item)) {
+                event.setCancelled(true);
+                if (boost == 1) {
+                    BoosterUtil.runBooster(complexProficiencies, stack, item);
+                    player.sendMessage(ChatColor.GREEN + "You have activated a booster!");
+                    player.playSound(player.getLocation(), Sound.ENTITY_FIREWORK_BLAST, 1f, 1f);
+                } else {
+                    player.sendMessage(ChatColor.RED + "Global Boost is at maximum value!");
+                }
+            }
+        }
+    }
+}

src/main/java/com/miketheshadow/complexproficiencies/utils/ExperienceUtil.java

@@ -36,6 +36,7 @@
 
 public class ExperienceUtil
 {
+
     /*
     public static void addPartyExperience(CustomUser user, Player player, int level, boolean mute, boolean isVanilla) {
         int addition = level * 5;

src/main/resources/plugin.yml

@@ -4,7 +4,7 @@ main: com.miketheshadow.complexproficiencies.ComplexProficiencies
 api-version: 1.13
 authors: [MikeTheShadow]
 description: Creates complex proficiencies For MC.
-depend: [NBTAPI,WorldGuard,XPBoost,Vault,Duels]
+depend: [NBTAPI,WorldGuard,Vault,Duels]
 commands:
   crecipe:
     description: Recipe modification command
@@ -115,4 +115,20 @@ commands:
     description: Adds experience to the party.
     usage: /<addpartyexperience> [player] level [levelNumber]
     permission: ComplexProficiencies.levelAdmin
-    permission-message: You don't have ComplexProficiencies.levelAdmin permission
+    permission-message: You don't have ComplexProficiencies.levelAdmin permission
+##EXPBOOSTERS
+  setboost:
+    description: Sets the current boost
+    usage: /<setboost> [amount] [time]
+    permission: ComplexProficiencies.levelAdmin
+    permission-message: You don't have ComplexProficiencies.levelAdmin permission
+  clearboost:
+    description: Clears the current boost
+    usage: /<clearboost>
+    permission: ComplexProficiencies.levelAdmin
+    permission-message: You don't have ComplexProficiencies.levelAdmin permission
+  createbooster:
+    description: Generates a booster item
+    usage: /<createbooster> [amount] [time]
+    permission: ComplexProficiencies.levelAdmin
+    permission-message: You don't have ComplexProficiencies.levelAdmin permission