From ec4fbe678e65fa5be06891a0d8a2a4c8df6eab3f Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 24 Sep 2019 14:01:26 -0700 Subject: [PATCH] Static Abuse Removal - Motd ( now MessageOfTheDayUtils ) --- .../nossr50/listeners/PlayerListener.java | 3 +- src/main/java/com/gmail/nossr50/mcMMO.java | 10 +++++++ .../{Motd.java => MessageOfTheDayUtils.java} | 29 +++++++++++-------- 3 files changed, 28 insertions(+), 14 deletions(-) rename src/main/java/com/gmail/nossr50/util/{Motd.java => MessageOfTheDayUtils.java} (84%) diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index f211310b0..eb76181ee 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -19,7 +19,6 @@ import com.gmail.nossr50.skills.taming.TamingManager; import com.gmail.nossr50.util.ChimaeraWing; import com.gmail.nossr50.util.HardcoreManager; import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.Motd; import com.gmail.nossr50.util.sounds.SoundManager; import com.gmail.nossr50.util.sounds.SoundType; import org.bukkit.Bukkit; @@ -517,7 +516,7 @@ public class PlayerListener implements Listener { new PlayerProfileLoadingTask(pluginRef, player).runTaskLaterAsynchronously(pluginRef, 60); if (pluginRef.getConfigManager().getConfigMOTD().isEnableMOTD()) { - Motd.displayAll(player); + pluginRef.getMessageOfTheDayUtils().displayAll(player); } if (pluginRef.isXPEventEnabled()) { diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index c64dcbf6b..070a93e55 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -99,6 +99,7 @@ public class mcMMO extends JavaPlugin { private ItemTools itemTools; private PermissionTools permissionTools; private WorldGuardUtils worldGuardUtils; + private MessageOfTheDayUtils messageOfTheDayUtils; private ZipLibrary zipLibrary; /* Never-Ending tasks */ @@ -277,6 +278,9 @@ public class mcMMO extends JavaPlugin { //Init World Guard Utils (Not sure about the order of this one, might need to be loaded earlier) worldGuardUtils = new WorldGuardUtils(this); + + //Init MOTD Utils + messageOfTheDayUtils = new MessageOfTheDayUtils(this); } @Override @@ -809,4 +813,10 @@ public class mcMMO extends JavaPlugin { public WorldGuardUtils getWorldGuardUtils() { return worldGuardUtils; } + + public MessageOfTheDayUtils getMessageOfTheDayUtils() { + return messageOfTheDayUtils; + } + + } diff --git a/src/main/java/com/gmail/nossr50/util/Motd.java b/src/main/java/com/gmail/nossr50/util/MessageOfTheDayUtils.java similarity index 84% rename from src/main/java/com/gmail/nossr50/util/Motd.java rename to src/main/java/com/gmail/nossr50/util/MessageOfTheDayUtils.java index cc6b61b6e..f10ba77c4 100644 --- a/src/main/java/com/gmail/nossr50/util/Motd.java +++ b/src/main/java/com/gmail/nossr50/util/MessageOfTheDayUtils.java @@ -1,20 +1,25 @@ package com.gmail.nossr50.util; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; +import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.skills.PerksUtils; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginDescriptionFile; import java.text.DecimalFormat; -public final class Motd { - public static final String PERK_PREFIX = pluginRef.getLocaleManager().getString("MOTD.PerksPrefix") + " "; - private static final PluginDescriptionFile pluginDescription = pluginRef.getDescription(); +public final class MessageOfTheDayUtils { + private final mcMMO pluginRef; + public final String PERK_PREFIX; + private final PluginDescriptionFile pluginDescription; - private Motd() { + public MessageOfTheDayUtils(mcMMO pluginRef) { + this.pluginRef = pluginRef; + PERK_PREFIX = pluginRef.getLocaleManager().getString("MOTD.PerksPrefix") + " "; + pluginDescription = pluginRef.getDescription(); } - public static void displayAll(Player player) { + public void displayAll(Player player) { displayVersion(player, pluginDescription.getVersion()); displayHardcoreSettings(player); displayXpPerks(player); @@ -30,7 +35,7 @@ public final class Motd { * @param player Target player * @param version Plugin version */ - public static void displayVersion(Player player, String version) { + public void displayVersion(Player player, String version) { if (pluginRef.getPermissionTools().showversion(player)) { player.sendMessage(pluginRef.getLocaleManager().getString("MOTD.Version.Overhaul", version)); } @@ -41,7 +46,7 @@ public final class Motd { * * @param player Target player */ - public static void displayHardcoreSettings(Player player) { + public void displayHardcoreSettings(Player player) { boolean deathStatLossEnabled = HardcoreManager.isStatLossEnabled(); boolean vampirismEnabled = HardcoreManager.isVampirismEnabled(); @@ -81,7 +86,7 @@ public final class Motd { * * @param player Target player */ - public static void displayXpPerks(Player player) { + public void displayXpPerks(Player player) { for (PrimarySkillType skill : PrimarySkillType.values()) { // if (PerksUtils.handleXpPerks(player, 1, skill) > 1) { // player.sendMessage(PERK_PREFIX + pluginRef.getLocaleManager().getString("Effects.Template", pluginRef.getLocaleManager().getString("Perks.XP.Name"), pluginRef.getLocaleManager().getString("Perks.XP.Desc"))); @@ -95,7 +100,7 @@ public final class Motd { * * @param player Target player */ - public static void displayCooldownPerks(Player player) { + public void displayCooldownPerks(Player player) { double cooldownReduction = 1 - (PerksUtils.handleCooldownPerks(player, 12) / 12.0); if (cooldownReduction > 0.0) { @@ -109,7 +114,7 @@ public final class Motd { * * @param player Target player */ - public static void displayActivationPerks(Player player) { + public void displayActivationPerks(Player player) { int perkAmount = pluginRef.getSkillTools().getEnduranceLength(player); if (perkAmount > 0) { @@ -122,7 +127,7 @@ public final class Motd { * * @param player Target player */ - public static void displayLuckyPerks(Player player) { + public void displayLuckyPerks(Player player) { for (PrimarySkillType skill : PrimarySkillType.values()) { if (pluginRef.getPermissionTools().lucky(player, skill)) { player.sendMessage(PERK_PREFIX + pluginRef.getLocaleManager().getString("Effects.Template", pluginRef.getLocaleManager().getString("Perks.Lucky.Name"), pluginRef.getLocaleManager().getString("Perks.Lucky.Desc.Login"))); @@ -137,7 +142,7 @@ public final class Motd { * @param player Target player * @param website Plugin website */ - public static void displayWebsite(Player player, String website) { + public void displayWebsite(Player player, String website) { player.sendMessage(pluginRef.getLocaleManager().getString("MOTD.Website", website)); } }