From 021ea69d7367cf9e26d6a705603d9ab06d32eea1 Mon Sep 17 00:00:00 2001 From: Mykyta Date: Thu, 10 Oct 2019 07:06:45 -0700 Subject: [PATCH] =?UTF-8?q?=E2=9A=99=20Starting=20to=20clean=20things=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/xyz/nkomarn/Harbor/Harbor.java | 2 +- .../Harbor/listener/PlayerListener.java | 20 +++++++++---------- .../Harbor/task/AccelerateNightTask.java | 4 +--- .../java/xyz/nkomarn/Harbor/task/Checker.java | 8 ++------ .../java/xyz/nkomarn/Harbor/util/Config.java | 2 +- .../xyz/nkomarn/Harbor/util/Messages.java | 8 ++++++-- .../java/xyz/nkomarn/Harbor/util/Updater.java | 4 ---- 7 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/main/java/xyz/nkomarn/Harbor/Harbor.java b/src/main/java/xyz/nkomarn/Harbor/Harbor.java index c19a100..b542c3e 100644 --- a/src/main/java/xyz/nkomarn/Harbor/Harbor.java +++ b/src/main/java/xyz/nkomarn/Harbor/Harbor.java @@ -27,7 +27,7 @@ public class Harbor extends JavaPlugin { getServer().getPluginManager().registerEvents(new PlayerListener(), this); // bStats - final Metrics metrics = new Metrics(this); + new Metrics(this); // Essentials hook essentials = (Essentials) Bukkit.getServer().getPluginManager().getPlugin("Essentials"); diff --git a/src/main/java/xyz/nkomarn/Harbor/listener/PlayerListener.java b/src/main/java/xyz/nkomarn/Harbor/listener/PlayerListener.java index 87f75bc..18c7783 100644 --- a/src/main/java/xyz/nkomarn/Harbor/listener/PlayerListener.java +++ b/src/main/java/xyz/nkomarn/Harbor/listener/PlayerListener.java @@ -11,17 +11,21 @@ import xyz.nkomarn.Harbor.util.Messages; public class PlayerListener implements Listener { - // Removed for testing + // Not sure if I will include this in final release /*@EventHandler(priority = EventPriority.HIGH) public void onBedEnter(final PlayerBedEnterEvent event) { if (event.getBedEnterResult() != PlayerBedEnterEvent.BedEnterResult.OK) { return; } - final World world = event.getPlayer().getWorld(); - if (morePlayerNeeded(world, 1)) { - Message.sendChatMessage(world, "messages.chat.sleeping", event.getPlayer().getDisplayName(), 1); - Message.sendActionbarMessage(world, "messages.actionbar.sleeping", event.getPlayer().getDisplayName(), 0); + + boolean success = false; // 1.13 API change makes this necessary + try {if (event.getBedEnterResult() == PlayerBedEnterEvent.BedEnterResult.OK) success = true;} + catch (NoSuchMethodError nme) {success = true;} + + if (success) { + final World world = event.getPlayer().getWorld(); + } } @@ -31,12 +35,6 @@ public class PlayerListener implements Listener { if (Checker.isNight(world) && !Checker.skippingWorlds.contains(world) && morePlayerNeeded(world, 0)) { Message.sendChatMessage(world, "messages.chat.left", event.getPlayer().getDisplayName(), 0); } - } - - private boolean morePlayerNeeded(final World world, final int change) { - final int sleeping = Checker.getSleeping(world) + change; - final int needed = Checker.getNeeded(world) - change; - return sleeping > 0 && needed > 0; }*/ } diff --git a/src/main/java/xyz/nkomarn/Harbor/task/AccelerateNightTask.java b/src/main/java/xyz/nkomarn/Harbor/task/AccelerateNightTask.java index c5895d9..d90c5ad 100644 --- a/src/main/java/xyz/nkomarn/Harbor/task/AccelerateNightTask.java +++ b/src/main/java/xyz/nkomarn/Harbor/task/AccelerateNightTask.java @@ -1,6 +1,5 @@ package xyz.nkomarn.Harbor.task; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Statistic; import org.bukkit.World; @@ -24,8 +23,7 @@ public class AccelerateNightTask extends BukkitRunnable { ChatColor.GREEN + "Current world time: " + time)); } else { // Announce night skip and clear queue - Bukkit.getServer().broadcastMessage("Harbor - skipped"); - // Message.sendRandomChatMessage(world, "messages.chat.skipped"); + Messages.sendRandomChatMessage(world, "messages.chat.skipped"); Checker.skippingWorlds.remove(world); // Reset sleep statistic if phantoms are disabled diff --git a/src/main/java/xyz/nkomarn/Harbor/task/Checker.java b/src/main/java/xyz/nkomarn/Harbor/task/Checker.java index df99a59..80696fb 100644 --- a/src/main/java/xyz/nkomarn/Harbor/task/Checker.java +++ b/src/main/java/xyz/nkomarn/Harbor/task/Checker.java @@ -38,12 +38,8 @@ public class Checker implements Runnable { } else if (needed == 0 && sleeping > 0) { world.getPlayers().forEach(player -> Messages.sendActionBarMessage(player, Config.getString("messages.actionbar.everyone"))); - } - - // Check if world is applicable for skipping - if (needed == 0 && sleeping > 0) { - skippingWorlds.add(world); - new AccelerateNightTask(world).runTaskTimer(Harbor.instance, 0L, 1); + skippingWorlds.add(world); + new AccelerateNightTask(world).runTaskTimer(Harbor.instance, 0L, 1); } } diff --git a/src/main/java/xyz/nkomarn/Harbor/util/Config.java b/src/main/java/xyz/nkomarn/Harbor/util/Config.java index bbba8b2..8cc4676 100644 --- a/src/main/java/xyz/nkomarn/Harbor/util/Config.java +++ b/src/main/java/xyz/nkomarn/Harbor/util/Config.java @@ -18,7 +18,7 @@ public class Config { /** * Fetches a string from the configuration - * if location is not found, empty String is returned + * if location is not found, empty string is returned * * @param location Configuration location of the string */ diff --git a/src/main/java/xyz/nkomarn/Harbor/util/Messages.java b/src/main/java/xyz/nkomarn/Harbor/util/Messages.java index 8432b34..eea239d 100644 --- a/src/main/java/xyz/nkomarn/Harbor/util/Messages.java +++ b/src/main/java/xyz/nkomarn/Harbor/util/Messages.java @@ -15,13 +15,17 @@ public class Messages { public static void sendRandomChatMessage(final World world, final String messageList) { final List messages = Config.getList(messageList); final int index = new Random().nextInt(messages.size()); - world.getPlayers().forEach(p -> sendChatMessage(p, messages.get(index))); + sendWorldChatMessage(world, messages.get(index)); } - private static void sendChatMessage(final Player player, final String message) { + private static void sendPlayerChatMessage(final Player player, final String message) { player.sendMessage(ChatColor.translateAlternateColorCodes('&', message)); } + private static void sendWorldChatMessage(final World world, final String message) { + world.getPlayers().forEach(player -> player.sendMessage(ChatColor.translateAlternateColorCodes('&', message))); + } + public static void sendActionBarMessage(final Player player, final String message) { final World world = player.getWorld(); player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText( diff --git a/src/main/java/xyz/nkomarn/Harbor/util/Updater.java b/src/main/java/xyz/nkomarn/Harbor/util/Updater.java index 0bf1b82..8490aa8 100644 --- a/src/main/java/xyz/nkomarn/Harbor/util/Updater.java +++ b/src/main/java/xyz/nkomarn/Harbor/util/Updater.java @@ -1,14 +1,10 @@ package xyz.nkomarn.Harbor.util; import org.bukkit.Bukkit; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.plugin.InvalidDescriptionException; -import org.bukkit.plugin.InvalidPluginException; import xyz.nkomarn.Harbor.Harbor; import java.io.*; import java.net.URL; -import java.net.URLClassLoader; import java.net.URLConnection; import java.nio.file.Files; import java.nio.file.Paths;