refactor, fixed an issue with loot chests cooldown

src/main/java/net/Indyuce/mmocore/MMOCore.java

@@ -5,7 +5,7 @@ import io.lumine.mythic.lib.version.SpigotPlugin;
 import io.lumine.mythic.utils.plugin.LuminePlugin;
 import net.Indyuce.mmocore.api.ConfigFile;
 import net.Indyuce.mmocore.api.PlayerActionBar;
-import net.Indyuce.mmocore.api.loot.LootChest;
+import net.Indyuce.mmocore.loot.chest.LootChest;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource;
 import net.Indyuce.mmocore.api.player.social.guilds.Guild;

src/main/java/net/Indyuce/mmocore/api/block/BlockInfo.java

@@ -5,8 +5,8 @@ import io.lumine.mythic.lib.api.MMOLineConfig;
 import io.lumine.mythic.lib.api.condition.type.BlockCondition;
 import io.lumine.mythic.lib.api.condition.type.MMOCondition;
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.droptable.DropTable;
+import net.Indyuce.mmocore.loot.droptable.DropTable;
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
 import net.Indyuce.mmocore.api.quest.trigger.Trigger;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Location;

src/main/java/net/Indyuce/mmocore/api/event/LootChestSpawnEvent.java

@@ -3,8 +3,8 @@ package net.Indyuce.mmocore.api.event;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
-import net.Indyuce.mmocore.api.loot.LootChest;
+import net.Indyuce.mmocore.loot.chest.LootChest;
 import net.Indyuce.mmocore.api.player.PlayerData;
 
 public class LootChestSpawnEvent extends PlayerDataEvent implements Cancellable {

src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java

@@ -6,17 +6,17 @@ import org.bukkit.configuration.ConfigurationSection;
 import net.Indyuce.mmocore.api.block.BlockType;
 import net.Indyuce.mmocore.api.block.SkullBlockType;
 import net.Indyuce.mmocore.api.block.VanillaBlockType;
-import net.Indyuce.mmocore.api.droptable.condition.BiomeCondition;
+import net.Indyuce.mmocore.loot.droptable.condition.BiomeCondition;
-import net.Indyuce.mmocore.api.droptable.condition.Condition;
+import net.Indyuce.mmocore.loot.droptable.condition.Condition;
-import net.Indyuce.mmocore.api.droptable.condition.LevelCondition;
+import net.Indyuce.mmocore.loot.droptable.condition.LevelCondition;
-import net.Indyuce.mmocore.api.droptable.condition.PermissionCondition;
+import net.Indyuce.mmocore.loot.droptable.condition.PermissionCondition;
-import net.Indyuce.mmocore.api.droptable.condition.WorldCondition;
+import net.Indyuce.mmocore.loot.droptable.condition.WorldCondition;
-import net.Indyuce.mmocore.api.droptable.dropitem.DropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.DropItem;
-import net.Indyuce.mmocore.api.droptable.dropitem.DropTableDropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.DropTableDropItem;
-import net.Indyuce.mmocore.api.droptable.dropitem.GoldDropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.GoldDropItem;
-import net.Indyuce.mmocore.api.droptable.dropitem.MMDropTableDropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.MMDropTableDropItem;
-import net.Indyuce.mmocore.api.droptable.dropitem.NoteDropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.NoteDropItem;
-import net.Indyuce.mmocore.api.droptable.dropitem.VanillaDropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.VanillaDropItem;
 import net.Indyuce.mmocore.experience.source.BrewPotionExperienceSource;
 import net.Indyuce.mmocore.experience.source.CraftItemExperienceSource;
 import net.Indyuce.mmocore.experience.source.EnchantItemExperienceSource;

src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java

@@ -2,8 +2,8 @@ package net.Indyuce.mmocore.api.load;
 
 import io.lumine.mythic.lib.api.MMOLineConfig;
 import net.Indyuce.mmocore.api.block.BlockType;
-import net.Indyuce.mmocore.api.droptable.condition.Condition;
+import net.Indyuce.mmocore.loot.droptable.condition.Condition;
-import net.Indyuce.mmocore.api.droptable.dropitem.DropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.DropItem;
 import net.Indyuce.mmocore.experience.provider.ExperienceDispenser;
 import net.Indyuce.mmocore.experience.source.type.ExperienceSource;
 import net.Indyuce.mmocore.api.quest.objective.Objective;

src/main/java/net/Indyuce/mmocore/api/loot/LootChestRegion.java

@@ -1,185 +0,0 @@
-package net.Indyuce.mmocore.api.loot;
-
-import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.event.LootChestSpawnEvent;
-import net.Indyuce.mmocore.api.player.PlayerData;
-import org.apache.commons.lang.Validate;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Chest;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.util.Vector;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Random;
-import java.util.Set;
-import java.util.logging.Level;
-
-public class LootChestRegion {
-	private final String id;
-
-	private final long chestSpawnPeriod;
-	private final RegionBounds bounds;
-	private final ChestAlgorithmOptions algOptions;
-	private final Set<ChestTier> tiers = new LinkedHashSet<>();
-	private final BukkitRunnable runnable;
-
-	private static final Random random = new Random();
-
-	public LootChestRegion(ConfigurationSection config) {
-		Validate.notNull(config, "Could not load config");
-		id = config.getName().toLowerCase().replace("_", "-").replace(" ", "-");
-
-		bounds = new RegionBounds(config.getConfigurationSection("bounds"));
-		chestSpawnPeriod = config.getLong("spawn-period", 5 * 60);
-		algOptions = config.contains("algorithm-options") ? new ChestAlgorithmOptions(config.getConfigurationSection("algorithm-options"))
-				: ChestAlgorithmOptions.DEFAULT;
-
-		Validate.isTrue(config.isConfigurationSection("tiers"), "Could not find chest tiers");
-		for (String key : config.getConfigurationSection("tiers").getKeys(false))
-			try {
-				tiers.add(new ChestTier(config.getConfigurationSection("tiers." + key)));
-			} catch (IllegalArgumentException exception) {
-				MMOCore.plugin.getLogger().log(Level.WARNING,
-						"Could not load tier '" + key + "' from chest region '" + id + "': " + exception.getMessage());
-			}
-
-		Validate.isTrue(!tiers.isEmpty(), "Your region must have at least one chest tier");
-
-		runnable = new LootChestRunnable(this);
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public Set<ChestTier> getTiers() {
-		return tiers;
-	}
-
-	public RegionBounds getBounds() {
-		return bounds;
-	}
-
-	public long getChestSpawnPeriod() {
-		return chestSpawnPeriod;
-	}
-
-	public BukkitRunnable getRunnable() {
-		return runnable;
-	}
-
-	public void spawnChest(PlayerData player) {
-		if(!player.isOnline()) return;
-		// first randomly determine the chest tier
-		ChestTier tier = rollTier();
-
-		// find a random location, 20 trials max
-		Location location = getRandomLocation(player.getPlayer().getLocation());
-		if (location == null)
-			return;
-
-		LootChest lootChest = new LootChest(tier, this, location.getBlock());
-		LootBuilder builder = new LootBuilder(player, tier.rollCapacity(player));
-		tier.getDropTable().collect(builder);
-
-		LootChestSpawnEvent event = new LootChestSpawnEvent(player, lootChest, builder);
-		Bukkit.getPluginManager().callEvent(event);
-		if (event.isCancelled())
-			return;
-
-		List<Integer> slots = new ArrayList<>();
-		for (int j = 0; j < 27; j++)
-			slots.add(j);
-
-		location.getBlock().setType(Material.CHEST);
-		Chest chest = (Chest) location.getBlock().getState();
-		tier.getDropTable().collect(builder).forEach(item -> {
-			Integer slot = slots.get(random.nextInt(slots.size()));
-			chest.getInventory().setItem(slot, item);
-			slots.remove(slot);
-		});
-
-		MMOCore.plugin.lootChests.register(lootChest);
-	}
-
-	// TODO improve
-	// TODO stat to increase chance to get higher tiers?
-	public ChestTier rollTier() {
-
-		double s = 0;
-		for (ChestTier tier : tiers) {
-			if (random.nextDouble() < tier.chance / (1 - s))
-				return tier;
-			s += tier.chance;
-		}
-
-		return tiers.stream().findAny().orElse(null);
-	}
-
-	public Location getRandomLocation(Location center) {
-
-		for (int j = 0; j < algOptions.iterations; j++) {
-			Location random = tryRandomDirection(center);
-			if (random != null)
-				return random;
-		}
-
-		/*
-		 * no location has been found after the X iterations, return null and
-		 * cancel chest spawning. worst case scenario, should not happen too
-		 * often except if the player is in a really NARROW zone
-		 */
-		return null;
-	}
-
-	public Location tryRandomDirection(Location center) {
-
-		/*
-		 * chooses a random direction and get the block in that direction which
-		 * has the same height as the player
-		 */
-		double a = random.nextDouble() * 2 * Math.PI;
-		Vector dir = new Vector(Math.cos(a), 0, Math.sin(a))
-				.multiply(algOptions.minRange + random.nextDouble() * (algOptions.maxRange - algOptions.minRange));
-		Location random = center.add(dir);
-
-		/*
-		 * go up and down at the same time till it finds a non-solid block with
-		 * a solid block underneath
-		 */
-		for (int h = 0; h <= algOptions.height * 2; h++) {
-			int z = h % 2 == 0 ? h / 2 : -(h + 1) / 2; // bijective from N to Z
-			Location checked = random.clone().add(0, z, 0);
-			if (isSuitable(checked))
-				return checked;
-		}
-
-		return null;
-	}
-
-	private boolean isSuitable(Location loc) {
-		return !loc.getBlock().getType().isSolid() && loc.clone().add(0, -1, 0).getBlock().getType().isSolid();
-	}
-
-	public static class LootChestRunnable extends BukkitRunnable {
-		private final LootChestRegion region;
-
-		public LootChestRunnable(LootChestRegion region) {
-			this.region = region;
-
-			runTaskTimer(MMOCore.plugin, region.getChestSpawnPeriod() * 20, region.getChestSpawnPeriod() * 20);
-		}
-
-		@Override
-		public void run() {
-			Optional<PlayerData> found = region.getBounds().getPlayers().filter(PlayerData::canSpawnLootChest).findAny();
-			found.ifPresent(region::spawnChest);
-		}
-	}
-}

src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java

@@ -79,7 +79,7 @@ public class PlayerData extends OfflinePlayerData {
     // NON-FINAL player data stuff made public to facilitate field change
     public int skillGuiDisplayOffset;
     public SkillCasting skillCasting;
-    public boolean nocd;
+    public boolean noCooldown;
     public CombatRunnable combat;
 
     /**
@@ -845,7 +845,7 @@ public class PlayerData extends OfflinePlayerData {
         }
 
         // Apply cooldown, mana and stamina costs
-        if (!nocd) {
+        if (!noCooldown) {
             double flatCooldownReduction = Math.max(0, Math.min(1, getStats().getStat(StatType.COOLDOWN_REDUCTION) / 100));
             flatCooldownReduction *= flatCooldownReduction > 0 ? skill.getModifier("cooldown", getSkillLevel(skill.getSkill())) * 1000 : 0;
 

src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java

@@ -29,9 +29,9 @@ public class NoCooldownCommandTreeNode extends CommandTreeNode {
 		}
 
 		PlayerData data = PlayerData.get(player);
-		data.nocd = !data.nocd;
+		data.noCooldown = !data.noCooldown;
 		CommandVerbose.verbose(sender, CommandVerbose.CommandType.NOCD,
-			ChatColor.YELLOW + "NoCD " + (data.nocd ? "enabled" : "disabled") + " for " + player.getName() + ".");
+			ChatColor.YELLOW + "NoCD " + (data.noCooldown ? "enabled" : "disabled") + " for " + player.getName() + ".");
 		return CommandResult.SUCCESS;
 	}
 }

src/main/java/net/Indyuce/mmocore/comp/region/RegionCondition.java

@@ -3,8 +3,8 @@ package net.Indyuce.mmocore.comp.region;
 import java.util.Arrays;
 import java.util.List;
 
-import net.Indyuce.mmocore.api.droptable.condition.Condition;
+import net.Indyuce.mmocore.loot.droptable.condition.Condition;
-import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance;
+import net.Indyuce.mmocore.loot.droptable.condition.ConditionInstance;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 
 public class RegionCondition extends Condition {

src/main/java/net/Indyuce/mmocore/comp/region/WorldGuardMMOLoader.java

@@ -1,6 +1,6 @@
 package net.Indyuce.mmocore.comp.region;
 
-import net.Indyuce.mmocore.api.droptable.condition.Condition;
+import net.Indyuce.mmocore.loot.droptable.condition.Condition;
 import net.Indyuce.mmocore.api.load.MMOLoader;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 

src/main/java/net/Indyuce/mmocore/listener/BlockListener.java

@@ -6,9 +6,9 @@ import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.block.BlockInfo;
 import net.Indyuce.mmocore.api.block.BlockInfo.BlockInfoOption;
 import net.Indyuce.mmocore.api.block.VanillaBlockType;
-import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance;
+import net.Indyuce.mmocore.loot.droptable.condition.ConditionInstance;
 import net.Indyuce.mmocore.api.event.CustomBlockMineEvent;
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.util.MMOCoreUtils;
 import org.bukkit.*;

src/main/java/net/Indyuce/mmocore/listener/LootableChestsListener.java

@@ -6,7 +6,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.loot.LootChest;
+import net.Indyuce.mmocore.loot.chest.LootChest;
 
 public class LootableChestsListener implements Listener {
 	@EventHandler

src/main/java/net/Indyuce/mmocore/listener/profession/FishingListener.java

@@ -2,10 +2,10 @@ package net.Indyuce.mmocore.listener.profession;
 
 import io.lumine.mythic.lib.version.VersionSound;
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.droptable.dropitem.fishing.FishingDropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.fishing.FishingDropItem;
 import net.Indyuce.mmocore.api.event.CustomPlayerFishEvent;
 import net.Indyuce.mmocore.experience.EXPSource;
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.stats.StatType;
 import net.Indyuce.mmocore.api.util.MMOCoreUtils;

src/main/java/net/Indyuce/mmocore/loot/LootBuilder.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.loot;
+package net.Indyuce.mmocore.loot;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/net/Indyuce/mmocore/loot/chest/ChestAlgorithmOptions.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.loot;
+package net.Indyuce.mmocore.loot.chest;
 
 import org.apache.commons.lang.Validate;
 import org.bukkit.configuration.ConfigurationSection;

src/main/java/net/Indyuce/mmocore/loot/chest/ChestTier.java

@@ -1,8 +1,8 @@
-package net.Indyuce.mmocore.api.loot;
+package net.Indyuce.mmocore.loot.chest;
 
 import io.lumine.mythic.lib.api.math.ScalingFormula;
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.droptable.DropTable;
+import net.Indyuce.mmocore.loot.droptable.DropTable;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import org.bukkit.configuration.ConfigurationSection;
 

src/main/java/net/Indyuce/mmocore/loot/chest/LootChest.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.loot;
+package net.Indyuce.mmocore.loot.chest;
 
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.manager.SoundManager;

src/main/java/net/Indyuce/mmocore/loot/chest/LootChestRegion.java

@@ -0,0 +1,174 @@
+package net.Indyuce.mmocore.loot.chest;
+
+import net.Indyuce.mmocore.MMOCore;
+import net.Indyuce.mmocore.api.event.LootChestSpawnEvent;
+import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.loot.LootBuilder;
+import org.apache.commons.lang.Validate;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Chest;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.Vector;
+
+import java.util.*;
+import java.util.logging.Level;
+
+public class LootChestRegion {
+    private final String id;
+
+    private final long chestSpawnPeriod;
+    private final RegionBounds bounds;
+    private final ChestAlgorithmOptions algOptions;
+    private final Set<ChestTier> tiers = new LinkedHashSet<>();
+    private final BukkitRunnable runnable = new BukkitRunnable() {
+
+        @Override
+        public void run() {
+            getBounds().getPlayers().filter(PlayerData::canSpawnLootChest).findAny().ifPresent(player -> spawnChest(player));
+        }
+    };
+
+    private static final Random random = new Random();
+
+    public LootChestRegion(ConfigurationSection config) {
+        Validate.notNull(config, "Could not load config");
+        id = config.getName().toLowerCase().replace("_", "-").replace(" ", "-");
+
+        bounds = new RegionBounds(config.getConfigurationSection("bounds"));
+        chestSpawnPeriod = config.getLong("spawn-period", 5 * 60);
+        algOptions = config.contains("algorithm-options") ? new ChestAlgorithmOptions(config.getConfigurationSection("algorithm-options"))
+                : ChestAlgorithmOptions.DEFAULT;
+
+        Validate.isTrue(config.isConfigurationSection("tiers"), "Could not find chest tiers");
+        for (String key : config.getConfigurationSection("tiers").getKeys(false))
+            try {
+                tiers.add(new ChestTier(config.getConfigurationSection("tiers." + key)));
+            } catch (IllegalArgumentException exception) {
+                MMOCore.plugin.getLogger().log(Level.WARNING,
+                        "Could not load tier '" + key + "' from chest region '" + id + "': " + exception.getMessage());
+            }
+
+        Validate.isTrue(!tiers.isEmpty(), "Your region must have at least one chest tier");
+
+        // Run timer
+        runnable.runTaskTimer(MMOCore.plugin, chestSpawnPeriod * 20, chestSpawnPeriod * 20);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public Set<ChestTier> getTiers() {
+        return tiers;
+    }
+
+    public RegionBounds getBounds() {
+        return bounds;
+    }
+
+    public long getChestSpawnPeriod() {
+        return chestSpawnPeriod;
+    }
+
+    public BukkitRunnable getRunnable() {
+        return runnable;
+    }
+
+    public void spawnChest(PlayerData player) {
+
+        // Apply chest cooldown
+        player.applyLootChestCooldown();
+
+        // First randomly determine the chest tier
+        ChestTier tier = rollTier();
+
+        // Find a random location, 20 trials max
+        Location location = getRandomLocation(player.getPlayer().getLocation());
+        if (location == null)
+            return;
+
+        LootChest lootChest = new LootChest(tier, this, location.getBlock());
+        LootBuilder builder = new LootBuilder(player, tier.rollCapacity(player));
+        tier.getDropTable().collect(builder);
+
+        LootChestSpawnEvent event = new LootChestSpawnEvent(player, lootChest, builder);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled())
+            return;
+
+        List<Integer> slots = new ArrayList<>();
+        for (int j = 0; j < 27; j++)
+            slots.add(j);
+
+        location.getBlock().setType(Material.CHEST);
+        Chest chest = (Chest) location.getBlock().getState();
+        tier.getDropTable().collect(builder).forEach(item -> {
+            Integer slot = slots.get(random.nextInt(slots.size()));
+            chest.getInventory().setItem(slot, item);
+            slots.remove(slot);
+        });
+
+        MMOCore.plugin.lootChests.register(lootChest);
+    }
+
+    // TODO stat to increase chance to get higher tiers?
+    public ChestTier rollTier() {
+
+        double s = 0;
+        for (ChestTier tier : tiers) {
+            if (random.nextDouble() < tier.chance / (1 - s))
+                return tier;
+            s += tier.chance;
+        }
+
+        return tiers.stream().findAny().orElse(null);
+    }
+
+    public Location getRandomLocation(Location center) {
+
+        for (int j = 0; j < algOptions.iterations; j++) {
+            Location random = tryRandomDirection(center);
+            if (random != null)
+                return random;
+        }
+
+        /*
+         * no location has been found after the X iterations, return null and
+         * cancel chest spawning. worst case scenario, should not happen too
+         * often except if the player is in a really NARROW zone
+         */
+        return null;
+    }
+
+    public Location tryRandomDirection(Location center) {
+
+        /*
+         * chooses a random direction and get the block in that direction which
+         * has the same height as the player
+         */
+        double a = random.nextDouble() * 2 * Math.PI;
+        Vector dir = new Vector(Math.cos(a), 0, Math.sin(a))
+                .multiply(algOptions.minRange + random.nextDouble() * (algOptions.maxRange - algOptions.minRange));
+        Location random = center.add(dir);
+
+        /*
+         * go up and down at the same time till it finds a non-solid block with
+         * a solid block underneath
+         */
+        for (int h = 0; h <= algOptions.height * 2; h++) {
+            int z = h % 2 == 0 ? h / 2 : -(h + 1) / 2; // bijective from N to Z
+            Location checked = random.clone().add(0, z, 0);
+            if (isSuitable(checked))
+                return checked;
+        }
+
+        return null;
+    }
+
+    private boolean isSuitable(Location loc) {
+        return !loc.getBlock().getType().isSolid() && loc.clone().add(0, -1, 0).getBlock().getType().isSolid();
+    }
+}

src/main/java/net/Indyuce/mmocore/loot/chest/RegionBounds.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.loot;
+package net.Indyuce.mmocore.loot.chest;
 
 import java.util.stream.Stream;
 

src/main/java/net/Indyuce/mmocore/loot/chest/TierEffect.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.loot;
+package net.Indyuce.mmocore.loot.chest;
 
 import org.apache.commons.lang.Validate;
 import org.bukkit.Location;

src/main/java/net/Indyuce/mmocore/loot/droptable/DropTable.java

@@ -1,19 +1,19 @@
-package net.Indyuce.mmocore.api.droptable;
+package net.Indyuce.mmocore.loot.droptable;
 
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 
+import net.Indyuce.mmocore.loot.droptable.condition.Condition;
+import net.Indyuce.mmocore.loot.droptable.condition.ConditionInstance;
+import net.Indyuce.mmocore.loot.droptable.dropitem.DropItem;
 import org.apache.commons.lang.Validate;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.droptable.condition.Condition;
+import net.Indyuce.mmocore.loot.LootBuilder;
-import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance;
-import net.Indyuce.mmocore.api.droptable.dropitem.DropItem;
-import net.Indyuce.mmocore.api.loot.LootBuilder;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 import io.lumine.mythic.lib.api.util.PostLoadObject;
 

src/main/java/net/Indyuce/mmocore/loot/droptable/condition/BiomeCondition.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.droptable.condition;
+package net.Indyuce.mmocore.loot.droptable.condition;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/net/Indyuce/mmocore/loot/droptable/condition/Condition.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.droptable.condition;
+package net.Indyuce.mmocore.loot.droptable.condition;
 
 import io.lumine.mythic.lib.api.MMOLineConfig;
 

src/main/java/net/Indyuce/mmocore/loot/droptable/condition/ConditionInstance.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.droptable.condition;
+package net.Indyuce.mmocore.loot.droptable.condition;
 
 import java.util.List;
 import java.util.stream.Stream;

src/main/java/net/Indyuce/mmocore/loot/droptable/condition/LevelCondition.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.droptable.condition;
+package net.Indyuce.mmocore.loot.droptable.condition;
 
 import net.Indyuce.mmocore.api.player.PlayerData;
 import io.lumine.mythic.lib.api.MMOLineConfig;

src/main/java/net/Indyuce/mmocore/loot/droptable/condition/PermissionCondition.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.droptable.condition;
+package net.Indyuce.mmocore.loot.droptable.condition;
 
 import io.lumine.mythic.lib.api.MMOLineConfig;
 import org.bukkit.entity.Player;

src/main/java/net/Indyuce/mmocore/loot/droptable/condition/WorldCondition.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.droptable.condition;
+package net.Indyuce.mmocore.loot.droptable.condition;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/DropItem.java

@@ -1,8 +1,8 @@
-package net.Indyuce.mmocore.api.droptable.dropitem;
+package net.Indyuce.mmocore.loot.droptable.dropitem;
 
 import java.util.Random;
 
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
 import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 

src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/DropTableDropItem.java

@@ -1,10 +1,10 @@
-package net.Indyuce.mmocore.api.droptable.dropitem;
+package net.Indyuce.mmocore.loot.droptable.dropitem;
 
 import io.lumine.mythic.lib.api.MMOLineConfig;
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.droptable.DropTable;
+import net.Indyuce.mmocore.loot.droptable.DropTable;
-import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance;
+import net.Indyuce.mmocore.loot.droptable.condition.ConditionInstance;
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import org.apache.commons.lang.Validate;
 

src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/GoldDropItem.java

@@ -1,6 +1,6 @@
-package net.Indyuce.mmocore.api.droptable.dropitem;
+package net.Indyuce.mmocore.loot.droptable.dropitem;
 
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
 import net.Indyuce.mmocore.api.util.item.CurrencyItem;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 

src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/MMDropTableDropItem.java

@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.droptable.dropitem;
+package net.Indyuce.mmocore.loot.droptable.dropitem;
 
 import java.util.NoSuchElementException;
 
@@ -9,7 +9,7 @@ import io.lumine.xikage.mythicmobs.drops.DropMetadata;
 import io.lumine.xikage.mythicmobs.drops.DropTable;
 import io.lumine.xikage.mythicmobs.drops.IItemDrop;
 import io.lumine.xikage.mythicmobs.drops.LootBag;
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 
 public class MMDropTableDropItem extends DropItem {

src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/NoteDropItem.java

@@ -1,6 +1,6 @@
-package net.Indyuce.mmocore.api.droptable.dropitem;
+package net.Indyuce.mmocore.loot.droptable.dropitem;
 
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
 import net.Indyuce.mmocore.api.util.item.CurrencyItem;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 

src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/VanillaDropItem.java

@@ -1,9 +1,9 @@
-package net.Indyuce.mmocore.api.droptable.dropitem;
+package net.Indyuce.mmocore.loot.droptable.dropitem;
 
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 
 public class VanillaDropItem extends DropItem {

src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/fishing/FishingDropItem.java

@@ -1,11 +1,11 @@
-package net.Indyuce.mmocore.api.droptable.dropitem.fishing;
+package net.Indyuce.mmocore.loot.droptable.dropitem.fishing;
 
 import org.apache.commons.lang.Validate;
 import org.bukkit.inventory.ItemStack;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.droptable.dropitem.DropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.DropItem;
-import net.Indyuce.mmocore.api.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.LootBuilder;
 import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 

src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java

@@ -25,7 +25,6 @@ public class ConfigManager {
     public final CommandVerbose commandVerbose = new CommandVerbose();
 
     public boolean overrideVanillaExp, canCreativeCast, cobbleGeneratorXP, saveDefaultClassInfo;
-	public double expPartyBuff, regenPartyBuff;
     public String partyChatPrefix, noSkillBoundPlaceholder;
     public ChatColor staminaFull, staminaHalf, staminaEmpty;
     public long combatLogTimer, lootChestExpireTime, lootChestPlayerCooldown;
@@ -96,7 +95,7 @@ public class ConfigManager {
         partyChatPrefix = MMOCore.plugin.getConfig().getString("party.chat-prefix");
         combatLogTimer = MMOCore.plugin.getConfig().getInt("combat-log.timer") * 1000L;
         lootChestExpireTime = Math.max(MMOCore.plugin.getConfig().getInt("loot-chests.chest-expire-time"), 1) * 1000L;
-		lootChestPlayerCooldown = MMOCore.plugin.getConfig().getInt("player-cooldown") * 1000L;
+        lootChestPlayerCooldown = (long) MMOCore.plugin.getConfig().getDouble("player-cooldown") * 1000L;
         noSkillBoundPlaceholder = getSimpleMessage("no-skill-placeholder").message();
 
         staminaFull = getColorOrDefault("stamina-whole", ChatColor.GREEN);

src/main/java/net/Indyuce/mmocore/manager/CustomBlockManager.java

@@ -7,8 +7,8 @@ import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock;
 import net.Indyuce.mmocore.api.block.BlockType;
 import net.Indyuce.mmocore.api.block.SkullBlockType;
 import net.Indyuce.mmocore.api.block.VanillaBlockType;
-import net.Indyuce.mmocore.api.droptable.condition.Condition;
+import net.Indyuce.mmocore.loot.droptable.condition.Condition;
-import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance;
+import net.Indyuce.mmocore.loot.droptable.condition.ConditionInstance;
 import net.Indyuce.mmocore.api.util.MMOCoreUtils;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 import org.bukkit.Bukkit;

src/main/java/net/Indyuce/mmocore/manager/DropTableManager.java

@@ -14,7 +14,7 @@ import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.droptable.DropTable;
+import net.Indyuce.mmocore.loot.droptable.DropTable;
 
 public class DropTableManager implements MMOManager {
 	private final Map<String, DropTable> map = new HashMap<>();

src/main/java/net/Indyuce/mmocore/manager/LootChestManager.java

@@ -12,8 +12,8 @@ import org.bukkit.configuration.file.FileConfiguration;
 
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.ConfigFile;
-import net.Indyuce.mmocore.api.loot.LootChest;
+import net.Indyuce.mmocore.loot.chest.LootChest;
-import net.Indyuce.mmocore.api.loot.LootChestRegion;
+import net.Indyuce.mmocore.loot.chest.LootChestRegion;
 
 public class LootChestManager {
 

src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java

@@ -11,8 +11,8 @@ import org.bukkit.configuration.ConfigurationSection;
 import com.google.gson.JsonParseException;
 
 import net.Indyuce.mmocore.api.block.BlockType;
-import net.Indyuce.mmocore.api.droptable.condition.Condition;
+import net.Indyuce.mmocore.loot.droptable.condition.Condition;
-import net.Indyuce.mmocore.api.droptable.dropitem.DropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.DropItem;
 import net.Indyuce.mmocore.experience.source.type.ExperienceSource;
 import net.Indyuce.mmocore.api.load.DefaultMMOLoader;
 import net.Indyuce.mmocore.api.load.MMOLoader;

src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java

@@ -13,9 +13,9 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Entity;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.droptable.condition.Condition;
+import net.Indyuce.mmocore.loot.droptable.condition.Condition;
-import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance;
+import net.Indyuce.mmocore.loot.droptable.condition.ConditionInstance;
-import net.Indyuce.mmocore.api.droptable.dropitem.fishing.FishingDropItem;
+import net.Indyuce.mmocore.loot.droptable.dropitem.fishing.FishingDropItem;
 import net.Indyuce.mmocore.manager.MMOManager;
 import io.lumine.mythic.lib.api.MMOLineConfig;