diff options
14 files changed, 110 insertions, 110 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java index dbc9b4e6..735da4d6 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java @@ -692,12 +692,12 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { } public BossBar getBossBarHandle() { - return bossBarHandle; - } + return bossBarHandle; + } public ActionBar getActionBarHandle() { - return actionBarHandle; - } + return actionBarHandle; + } public VersionSpecificHandler getVersionSpecificHandler() { return versionSpecificHandler; diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar.java index 5a7ea51c..9375b96c 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar.java @@ -4,6 +4,6 @@ import org.bukkit.entity.Player; public interface ActionBar { - void sendActionBar(Player p, String line); + void sendActionBar(Player p, String line); } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar_Bukkit.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar_Bukkit.java index 36d1b24f..e806c58d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar_Bukkit.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar_Bukkit.java @@ -7,9 +7,9 @@ import net.md_5.bungee.api.chat.TextComponent; public class ActionBar_Bukkit implements ActionBar { - @SuppressWarnings("deprecation") - @Override - public void sendActionBar(Player p, String line) { - p.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(line)); - } + @SuppressWarnings("deprecation") + @Override + public void sendActionBar(Player p, String line) { + p.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(line)); + } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar_Nothing.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar_Nothing.java index 8085153c..4721907d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar_Nothing.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/actionbar/ActionBar_Nothing.java @@ -4,9 +4,9 @@ import org.bukkit.entity.Player; public class ActionBar_Nothing implements ActionBar { - @Override - public void sendActionBar(Player p, String line) { - // version as 1.9 and under - } + @Override + public void sendActionBar(Player p, String line) { + // version as 1.9 and under + } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar.java index 04103697..cdeea0fb 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar.java @@ -4,8 +4,8 @@ import org.bukkit.entity.Player; public interface BossBar { - void sendBossBar(Player p, String questKey, String title, int time); + void sendBossBar(Player p, String questKey, String title, int time); - void sendBossBar(Player p, String questKey, String title, int progress, int time); - + void sendBossBar(Player p, String questKey, String title, int progress, int time); + } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar_Bukkit.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar_Bukkit.java index c0796c2a..2431abd8 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar_Bukkit.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar_Bukkit.java @@ -14,55 +14,55 @@ import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin; public class BossBar_Bukkit implements BossBar { - private BukkitQuestsPlugin plugin; - private final ConcurrentHashMap<NamespacedKey, Long> players = new ConcurrentHashMap<>(); + private BukkitQuestsPlugin plugin; + private final ConcurrentHashMap<NamespacedKey, Long> players = new ConcurrentHashMap<>(); - public BossBar_Bukkit(BukkitQuestsPlugin plugin) { - this.plugin = plugin; - plugin.getScheduler().runTaskTimer(() -> { - for (Entry<NamespacedKey, Long> entry : new HashMap<>(players).entrySet()) { - if (entry.getValue() < System.currentTimeMillis()) { - NamespacedKey key = entry.getKey(); - players.remove(key); - org.bukkit.boss.BossBar oldBar = Bukkit.getBossBar(key); - if(oldBar != null) { // if exist - oldBar.removeAll(); // remove all players on it - Bukkit.removeBossBar(key); // remove it - } - } - } - }, 20, 20); - } + public BossBar_Bukkit(BukkitQuestsPlugin plugin) { + this.plugin = plugin; + plugin.getScheduler().runTaskTimer(() -> { + for (Entry<NamespacedKey, Long> entry : new HashMap<>(players).entrySet()) { + if (entry.getValue() < System.currentTimeMillis()) { + NamespacedKey key = entry.getKey(); + players.remove(key); + org.bukkit.boss.BossBar oldBar = Bukkit.getBossBar(key); + if(oldBar != null) { // if exist + oldBar.removeAll(); // remove all players on it + Bukkit.removeBossBar(key); // remove it + } + } + } + }, 20, 20); + } - @Override - public void sendBossBar(Player p, String questKey, String title, int time) { - NamespacedKey spaceKey = getKeyFor(p, questKey); - org.bukkit.boss.BossBar bar = Bukkit.getBossBar(spaceKey); - if (bar == null) {// if none exist - bar = Bukkit.createBossBar(spaceKey, title, BarColor.BLUE, BarStyle.SOLID); - } else { - bar.setTitle(title); - } - players.put(spaceKey, System.currentTimeMillis() + time * 1000); - bar.addPlayer(p); // be sure it see it - } + @Override + public void sendBossBar(Player p, String questKey, String title, int time) { + NamespacedKey spaceKey = getKeyFor(p, questKey); + org.bukkit.boss.BossBar bar = Bukkit.getBossBar(spaceKey); + if (bar == null) {// if none exist + bar = Bukkit.createBossBar(spaceKey, title, BarColor.BLUE, BarStyle.SOLID); + } else { + bar.setTitle(title); + } + players.put(spaceKey, System.currentTimeMillis() + time * 1000); + bar.addPlayer(p); // be sure it see it + } - @Override - public void sendBossBar(Player p, String questKey, String title, int percent, int time) { - NamespacedKey spaceKey = getKeyFor(p, questKey); - org.bukkit.boss.BossBar bar = Bukkit.getBossBar(spaceKey); - if (bar == null) {// if none exist - bar = Bukkit.createBossBar(spaceKey, title, BarColor.BLUE, BarStyle.SOLID); - } else { - bar.setTitle(title); - } - players.put(spaceKey, System.currentTimeMillis() + time * 1000); - double progress = ((double) percent) / 100; - bar.setProgress(progress < 0 ? 0 : (progress > 1 ? 1 : progress)); - bar.addPlayer(p); // be sure it see it - } + @Override + public void sendBossBar(Player p, String questKey, String title, int percent, int time) { + NamespacedKey spaceKey = getKeyFor(p, questKey); + org.bukkit.boss.BossBar bar = Bukkit.getBossBar(spaceKey); + if (bar == null) {// if none exist + bar = Bukkit.createBossBar(spaceKey, title, BarColor.BLUE, BarStyle.SOLID); + } else { + bar.setTitle(title); + } + players.put(spaceKey, System.currentTimeMillis() + time * 1000); + double progress = ((double) percent) / 100; + bar.setProgress(progress < 0 ? 0 : (progress > 1 ? 1 : progress)); + bar.addPlayer(p); // be sure it see it + } - private NamespacedKey getKeyFor(Player p, String questKey) { - return new NamespacedKey(plugin, "bossbar_" + p.getName().toLowerCase() + "_" + questKey.toLowerCase().replace(" ", "")); - } + private NamespacedKey getKeyFor(Player p, String questKey) { + return new NamespacedKey(plugin, "bossbar_" + p.getName().toLowerCase() + "_" + questKey.toLowerCase().replace(" ", "")); + } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar_Nothing.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar_Nothing.java index 36a13fc7..6eb58032 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar_Nothing.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/bossbar/BossBar_Nothing.java @@ -4,14 +4,14 @@ import org.bukkit.entity.Player; public class BossBar_Nothing implements BossBar { - @Override - public void sendBossBar(Player p, String questKey, String title, int time) { - // old versions as 1.8 - } + @Override + public void sendBossBar(Player p, String questKey, String title, int time) { + // old versions as 1.8 + } - @Override - public void sendBossBar(Player p, String questKey, String title, int progress, int time) { - // old versions as 1.8 - } + @Override + public void sendBossBar(Player p, String questKey, String title, int progress, int time) { + // old versions as 1.8 + } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/PaginatedQMenu.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/PaginatedQMenu.java index b1718fb8..d3eff7ad 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/PaginatedQMenu.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/PaginatedQMenu.java @@ -107,23 +107,23 @@ public abstract class PaginatedQMenu extends QMenu { BukkitQuestsConfig config = (BukkitQuestsConfig) plugin.getQuestsConfig(); if ((menuElements.isEmpty() ? 0 : Ints.max(menuElements.keys)) + 1 > maxSize || menuElements.size() + menuElementsToFill.size() + customStaticElements > maxSize) { - PageNextMenuElement pageNextMenuElement = new PageNextMenuElement(config, this); - PagePrevMenuElement pagePrevMenuElement = new PagePrevMenuElement(config, this); - PageDescMenuElement pageDescMenuElement = new PageDescMenuElement(config, this); - // add manually spacer then let people change item + PageNextMenuElement pageNextMenuElement = new PageNextMenuElement(config, this); + PagePrevMenuElement pagePrevMenuElement = new PagePrevMenuElement(config, this); + PageDescMenuElement pageDescMenuElement = new PageDescMenuElement(config, this); + // add manually spacer then let people change item staticMenuElements[46] = spacer; staticMenuElements[47] = spacer; staticMenuElements[51] = spacer; staticMenuElements[52] = spacer; staticMenuElements[53] = spacer; - if(backMenuElement != null && backMenuElement.isEnabled()) - staticMenuElements[backMenuElement.getSlot()] = backMenuElement == null ? spacer : backMenuElement; + if(backMenuElement != null && backMenuElement.isEnabled()) + staticMenuElements[backMenuElement.getSlot()] = backMenuElement == null ? spacer : backMenuElement; if(pagePrevMenuElement.isEnabled()) - staticMenuElements[pagePrevMenuElement.getSlot()] = pagePrevMenuElement; + staticMenuElements[pagePrevMenuElement.getSlot()] = pagePrevMenuElement; if(pageDescMenuElement.isEnabled()) - staticMenuElements[pageDescMenuElement.getSlot()] = pageDescMenuElement; + staticMenuElements[pageDescMenuElement.getSlot()] = pageDescMenuElement; if(pageNextMenuElement.isEnabled()) - staticMenuElements[pageNextMenuElement.getSlot()] = pageNextMenuElement; + staticMenuElements[pageNextMenuElement.getSlot()] = pageNextMenuElement; // else find a place for the back button if needed } else if (backMenuElement != null && backMenuElement.isEnabled()) { diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/BackMenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/BackMenuElement.java index e47c78e8..7b9fa959 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/BackMenuElement.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/BackMenuElement.java @@ -38,11 +38,11 @@ public class BackMenuElement extends MenuElement { } public int getSlot() { - return config.getInt("gui.back-button.slot", 45); + return config.getInt("gui.back-button.slot", 45); } @Override public boolean isEnabled() { - return config.getBoolean("gui.back-button.enabled", true); + return config.getBoolean("gui.back-button.enabled", true); } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/MenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/MenuElement.java index 47a3e695..7be44a5a 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/MenuElement.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/MenuElement.java @@ -17,6 +17,6 @@ public abstract class MenuElement { public abstract ClickResult handleClick(ClickType clickType); public boolean isEnabled() { - return true; + return true; } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PageDescMenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PageDescMenuElement.java index 29b6a0fd..b35c134b 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PageDescMenuElement.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PageDescMenuElement.java @@ -33,11 +33,11 @@ public class PageDescMenuElement extends MenuElement { } public int getSlot() { - return config.getInt("gui.page-desc.slot", 49); + return config.getInt("gui.page-desc.slot", 49); } @Override public boolean isEnabled() { - return config.getBoolean("gui.page-desc.enabled", true); + return config.getBoolean("gui.page-desc.enabled", true); } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PageNextMenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PageNextMenuElement.java index 2650d39d..c51fb569 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PageNextMenuElement.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PageNextMenuElement.java @@ -36,11 +36,11 @@ public class PageNextMenuElement extends MenuElement { } public int getSlot() { - return config.getInt("gui.page-next.slot", 50); + return config.getInt("gui.page-next.slot", 50); } @Override public boolean isEnabled() { - return config.getBoolean("gui.page-next.enabled", true); + return config.getBoolean("gui.page-next.enabled", true); } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PagePrevMenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PagePrevMenuElement.java index 6ac0a85e..75e60272 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PagePrevMenuElement.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/PagePrevMenuElement.java @@ -36,11 +36,11 @@ public class PagePrevMenuElement extends MenuElement { } public int getSlot() { - return config.getInt("gui.page-prev.slot", 48); + return config.getInt("gui.page-prev.slot", 48); } @Override public boolean isEnabled() { - return config.getBoolean("gui.page-prev.enabled", true); + return config.getBoolean("gui.page-prev.enabled", true); } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java index 5771182f..9008306b 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java @@ -151,31 +151,31 @@ public class TaskUtils { return progress; } - public static void sendTrackAdvancement(Player player, Quest q, TaskProgress progress) { - String title = q.getPlaceholders().get("progress"); - if(title == null) - return; - title = ChatColor.translateAlternateColorCodes('&', QItemStack.processPlaceholders(title, progress)); + public static void sendTrackAdvancement(Player player, Quest q, TaskProgress progress) { + String title = q.getPlaceholders().get("progress"); + if(title == null) + return; + title = ChatColor.translateAlternateColorCodes('&', QItemStack.processPlaceholders(title, progress)); if (plugin.getQuestsConfig().getBoolean("options.gui-use-placeholderapi")) { - title = plugin.getPlaceholderAPIProcessor().apply(player, title); + title = plugin.getPlaceholderAPIProcessor().apply(player, title); } int progressAmount = getIntegerTaskProgress(progress); if(progressAmount > 0) { // if has value - Object amount = q.getTaskById(progress.getTaskId()).getConfigValue("amount"); - if(amount != null && amount instanceof Integer) - progressAmount = (progressAmount * 100) / (int) amount; // convert into percent - else - progressAmount = 0; // can't find max value + Object amount = q.getTaskById(progress.getTaskId()).getConfigValue("amount"); + if(amount != null && amount instanceof Integer) + progressAmount = (progressAmount * 100) / (int) amount; // convert into percent + else + progressAmount = 0; // can't find max value + } + if((plugin.getConfig().getBoolean("options.bossbar.complete", true) && progress.isCompleted()) || plugin.getConfig().getBoolean("options.bossbar.progress", true)) { + if(progressAmount > 0) + plugin.getBossBarHandle().sendBossBar(player, q.getId(), title, progressAmount, plugin.getConfig().getInt("options.bossbar.time", 10)); + else + plugin.getBossBarHandle().sendBossBar(player, q.getId(), title, plugin.getConfig().getInt("options.bossbar.time", 10)); + } + if((plugin.getConfig().getBoolean("options.actionbar.complete", true) && progress.isCompleted()) || plugin.getConfig().getBoolean("options.actionbar.progress", true)) { + plugin.getActionBarHandle().sendActionBar(player, title); } - if((plugin.getConfig().getBoolean("options.bossbar.complete", true) && progress.isCompleted()) || plugin.getConfig().getBoolean("options.bossbar.progress", true)) { - if(progressAmount > 0) - plugin.getBossBarHandle().sendBossBar(player, q.getId(), title, progressAmount, plugin.getConfig().getInt("options.bossbar.time", 10)); - else - plugin.getBossBarHandle().sendBossBar(player, q.getId(), title, plugin.getConfig().getInt("options.bossbar.time", 10)); - } - if((plugin.getConfig().getBoolean("options.actionbar.complete", true) && progress.isCompleted()) || plugin.getConfig().getBoolean("options.actionbar.progress", true)) { - plugin.getActionBarHandle().sendActionBar(player, title); - } } public static List<PendingTask> getApplicableTasks(Player player, QPlayer qPlayer, TaskType type) { |