From fc9942fdc4fd81e0054f4cf1aec7e10868968668 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 2 Jul 2019 18:27:17 -0700 Subject: [PATCH] Static Abuse Cleanup - MobHealthBarUtils (now MobHealthBarManager) --- .../gmail/nossr50/listeners/PlayerListener.java | 2 +- src/main/java/com/gmail/nossr50/mcMMO.java | 13 +++++++++++-- .../nossr50/runnables/skills/BleedTimerTask.java | 4 ++-- ...althbarUtils.java => MobHealthBarManager.java} | 15 +++++++++------ .../gmail/nossr50/util/skills/CombatUtils.java | 2 +- src/main/resources/locale/locale_fr.properties | 1 - 6 files changed, 24 insertions(+), 13 deletions(-) rename src/main/java/com/gmail/nossr50/util/{MobHealthbarUtils.java => MobHealthBarManager.java} (92%) diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index dad66ce2f..9f398f581 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -120,7 +120,7 @@ public class PlayerListener implements Listener { } Player player = event.getEntity(); - event.setDeathMessage(MobHealthbarUtils.fixDeathMessage(deathMessage, player)); + event.setDeathMessage(pluginRef.getMobHealthBarManager().fixDeathMessage(deathMessage, player)); } /** diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 1e9bbd274..4e20e2627 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -70,6 +70,7 @@ public class mcMMO extends JavaPlugin { private PartyManager partyManager; private LocaleManager localeManager; private ChatManager chatManager; + private MobHealthBarManager mobHealthBarManager; /* File Paths */ private String mainDirectory; @@ -189,7 +190,11 @@ public class mcMMO extends JavaPlugin { //Init Notification Manager notificationManager = new NotificationManager(); + //Init Chat Manager chatManager = new ChatManager(this); + + //Init Mob Health Bar Manager + mobHealthBarManager = new MobHealthBarManager(this); } @Override @@ -494,11 +499,11 @@ public class mcMMO extends JavaPlugin { } private void registerDynamicSettings() { - dynamicSettingsManager = new DynamicSettingsManager(); + dynamicSettingsManager = new DynamicSettingsManager(this); } private void loadConfigFiles() { - configManager = new ConfigManager(); + configManager = new ConfigManager(this); configManager.loadConfigs(); } @@ -620,4 +625,8 @@ public class mcMMO extends JavaPlugin { public ChatManager getChatManager() { return chatManager; } + + public MobHealthBarManager getMobHealthBarManager() { + return mobHealthBarManager; + } } diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java index daea51073..d305552af 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.runnables.skills; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.util.MobHealthbarUtils; +import com.gmail.nossr50.util.MobHealthBarManager; import com.gmail.nossr50.util.skills.CombatUtils; import com.gmail.nossr50.util.skills.ParticleEffectUtils; import com.gmail.nossr50.util.sounds.SoundManager; @@ -122,7 +122,7 @@ public class BleedTimerTask extends BukkitRunnable { // debugMessage+="Rank4Bonus=["+String.valueOf(containerEntry.getValue().bleedRank >= 3)+"], "; - MobHealthbarUtils.handleMobHealthbars(target, damage, pluginRef); //Update health bars + pluginRef.getMobHealthBarManager().handleMobHealthbars(target, damage, pluginRef); //Update health bars } // debugMessage+="FullArmor=["+String.valueOf(armorCount > 3)+"], "; diff --git a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java b/src/main/java/com/gmail/nossr50/util/MobHealthBarManager.java similarity index 92% rename from src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java rename to src/main/java/com/gmail/nossr50/util/MobHealthBarManager.java index f0b012a30..b8cfcd83e 100644 --- a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java +++ b/src/main/java/com/gmail/nossr50/util/MobHealthBarManager.java @@ -12,8 +12,11 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.metadata.FixedMetadataValue; -public final class MobHealthbarUtils { - private MobHealthbarUtils() { +public final class MobHealthBarManager { + private mcMMO pluginRef; + + public MobHealthBarManager(mcMMO pluginRef) { + this.pluginRef = pluginRef; } /** @@ -23,7 +26,7 @@ public final class MobHealthbarUtils { * @param player The player who died * @return the fixed death message */ - public static String fixDeathMessage(String deathMessage, Player player) { + public String fixDeathMessage(String deathMessage, Player player) { EntityDamageEvent lastDamageCause = player.getLastDamageCause(); String replaceString = lastDamageCause instanceof EntityDamageByEntityEvent ? StringUtils.getPrettyEntityTypeString(((EntityDamageByEntityEvent) lastDamageCause).getDamager().getType()) : "a mob"; @@ -36,7 +39,7 @@ public final class MobHealthbarUtils { * @param target the targetted entity * @param damage damage done by the attack triggering this */ - public static void handleMobHealthbars(LivingEntity target, double damage, mcMMO plugin) { + public void handleMobHealthbars(LivingEntity target, double damage, mcMMO plugin) { if (pluginRef.isHealthBarPluginEnabled() || !pluginRef.getConfigManager().getConfigMobs().getCombat().getHealthBars().isEnableHealthBars()) { return; } @@ -81,7 +84,7 @@ public final class MobHealthbarUtils { } } - private static String createHealthDisplay(MobHealthbarType mobHealthbarType, LivingEntity entity, double damage) { + private String createHealthDisplay(MobHealthbarType mobHealthbarType, LivingEntity entity, double damage) { double maxHealth = entity.getMaxHealth(); double currentHealth = Math.max(entity.getHealth() - damage, 0); double healthPercentage = (currentHealth / maxHealth) * 100.0D; @@ -145,7 +148,7 @@ public final class MobHealthbarUtils { * @param livingEntity The {@link LivingEntity} of the livingEntity to check * @return true if the livingEntity is a boss, false otherwise */ - private static boolean isBoss(LivingEntity livingEntity) { + private boolean isBoss(LivingEntity livingEntity) { switch (livingEntity.getType()) { case ENDER_DRAGON: case WITHER: diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index 77da365b1..3cbc6dbd3 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -812,6 +812,6 @@ public final class CombatUtils { return; } - MobHealthbarUtils.handleMobHealthbars(target, damage, plugin); + pluginRef.getMobHealthBarManager().handleMobHealthbars(target, damage, plugin); } } diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index b3728b74c..dd8cf245a 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -69,7 +69,6 @@ Axes.Skills.SS.Refresh=[[GREEN]]Votre comp\u00e9tence [[YELLOW]]Tranche-cr\u00e2 Axes.Skills.SS.Other.Off=Tranche-cr\u00e2ne[[GREEN]] s\'est termin\u00e9 pour [[YELLOW]]{0} Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] a utilis\u00e9 [[RED]]Tranche-cr\u00e2ne ! Axes.Skillup=Le talent Haches augmente de {0}. Total ({1}) -Axes.Ability.Bonus.0=Ma\u00eetrise des haches Excavation.Ability.Lower=[[GRAY]]**VOUS ABAISSEZ VOTRE PELLE** Excavation.Ability.Ready=[[GREEN]]**VOUS LEVEZ VOTRE PELLE** Excavation.SubSkill.GigaDrillBreaker.Name=Foreur (Comp\u00e9tence)