From 985fbdefd595744745e4dae8fe385594c79ca9dd Mon Sep 17 00:00:00 2001 From: ChanceSD <5256215+ChanceSD@users.noreply.github.com> Date: Fri, 7 Apr 2023 14:41:25 +0100 Subject: [PATCH] More changes --- .../{API => }/BaseDependency.java | 4 ++-- .../Dependencies/ForceToggleDependency.java | 2 +- .../Dependencies/Hooks/EssentialsHook.java | 4 ++-- .../Dependencies/Hooks/FactionsUUIDHook.java | 4 ++-- .../Hooks/GriefPreventionHook.java | 2 +- .../Dependencies/Hooks/LibsDisguisesHook.java | 4 ++-- .../Dependencies/Hooks/McMMOHook.java | 4 ++-- .../Hooks/PlaceHolderAPIHook.java | 2 +- .../Dependencies/Hooks/SaberFactionsHook.java | 4 ++-- .../Dependencies/Hooks/SimpleClansHook.java | 9 ++++---- .../Dependencies/Hooks/VaultHook.java | 2 +- .../Hooks/WorldGuardLegacyHook.java | 4 ++-- .../Hooks/WorldGuardModernHook.java | 4 ++-- .../{API => Interfaces}/Dependency.java | 2 +- .../DisguiseDependency.java | 2 +- .../{API => Interfaces}/GodDependency.java | 2 +- .../{API => Interfaces}/PvPDependency.java | 2 +- .../{API => Interfaces}/RegionDependency.java | 2 +- .../RegionPvPDependency.java | 2 +- .../WorldGuardDependency.java | 2 +- .../Libraries/Metrics/CustomMetrics.java | 2 +- .../Listeners/DebugEntityListener.java | 5 ++-- .../PvPManager/Listeners/EntityListener.java | 4 ++-- .../PvPManager/Listeners/MoveListener.java | 2 +- .../PvPManager/Listeners/MoveListener1_9.java | 2 +- .../PvPManager/Listeners/PlayerListener.java | 12 +++++----- .../Managers/DependencyManager.java | 20 ++++++++-------- .../PvPManager/Managers/DisplayManager.java | 3 ++- .../PvPManager/Managers/PlayerHandler.java | 5 +++- .../PvPManager/Player/BasePlayer.java | 4 ++-- .../me/NoChance/PvPManager/PvPManager.java | 5 ++-- .../java/me/NoChance/PvPManager/PvPlayer.java | 11 +++++---- .../PvPManager/Settings/Messages.java | 14 +++++------ .../PvPManager/Settings/Settings.java | 12 ++++------ .../PvPManager/Utils/CombatUtils.java | 14 ++++------- .../NoChance/PvPManager/Utils/DateUtil.java | 1 - .../NoChance/PvPManager/Utils/MCVersion.java | 23 +++++++++++++++++-- .../player/nametag/BukkitNameTag.java | 7 +++--- .../chancesd/pvpmanager/storage/Database.java | 7 +++--- .../Listeners/PlayerListenerTest.java | 5 ++-- 40 files changed, 118 insertions(+), 103 deletions(-) rename pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/{API => }/BaseDependency.java (84%) rename pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/{API => Interfaces}/Dependency.java (84%) rename pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/{API => Interfaces}/DisguiseDependency.java (76%) rename pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/{API => Interfaces}/GodDependency.java (79%) rename pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/{API => Interfaces}/PvPDependency.java (73%) rename pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/{API => Interfaces}/RegionDependency.java (84%) rename pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/{API => Interfaces}/RegionPvPDependency.java (59%) rename pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/{API => Interfaces}/WorldGuardDependency.java (92%) delete mode 100644 pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/DateUtil.java diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/BaseDependency.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/BaseDependency.java similarity index 84% rename from pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/BaseDependency.java rename to pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/BaseDependency.java index f5b38bace..13dc6cead 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/BaseDependency.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/BaseDependency.java @@ -1,9 +1,9 @@ -package me.NoChance.PvPManager.Dependencies.API; +package me.NoChance.PvPManager.Dependencies; import org.bukkit.ChatColor; import org.bukkit.plugin.java.JavaPlugin; -import me.NoChance.PvPManager.Dependencies.Hook; +import me.NoChance.PvPManager.Dependencies.Interfaces.Dependency; import me.NoChance.PvPManager.Utils.Log; public class BaseDependency implements Dependency { diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/ForceToggleDependency.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/ForceToggleDependency.java index 21dc6bb46..e0ddf2f34 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/ForceToggleDependency.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/ForceToggleDependency.java @@ -2,7 +2,7 @@ import org.bukkit.entity.Player; -import me.NoChance.PvPManager.Dependencies.API.Dependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.Dependency; import me.NoChance.PvPManager.Player.ProtectionResult; public interface ForceToggleDependency extends Dependency { diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/EssentialsHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/EssentialsHook.java index 72fdc3cd7..dcd460b40 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/EssentialsHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/EssentialsHook.java @@ -4,9 +4,9 @@ import com.earth2me.essentials.Essentials; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; -import me.NoChance.PvPManager.Dependencies.API.GodDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.GodDependency; public class EssentialsHook extends BaseDependency implements GodDependency { diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/FactionsUUIDHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/FactionsUUIDHook.java index 68a3d7a4d..9412d215f 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/FactionsUUIDHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/FactionsUUIDHook.java @@ -6,9 +6,9 @@ import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.perms.Relation; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; -import me.NoChance.PvPManager.Dependencies.API.PvPDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.PvPDependency; public class FactionsUUIDHook extends BaseDependency implements PvPDependency { diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/GriefPreventionHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/GriefPreventionHook.java index b0074e07b..b0fc5c0cb 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/GriefPreventionHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/GriefPreventionHook.java @@ -1,7 +1,7 @@ package me.NoChance.PvPManager.Dependencies.Hooks; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; import me.NoChance.PvPManager.Settings.Settings; import me.NoChance.PvPManager.Utils.Log; import me.ryanhamshire.GriefPrevention.GriefPrevention; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/LibsDisguisesHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/LibsDisguisesHook.java index c08a09632..9b72d1acb 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/LibsDisguisesHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/LibsDisguisesHook.java @@ -2,9 +2,9 @@ import org.bukkit.entity.Player; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; -import me.NoChance.PvPManager.Dependencies.API.DisguiseDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.DisguiseDependency; import me.NoChance.PvPManager.Utils.Log; import me.libraryaddict.disguise.DisguiseAPI; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/McMMOHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/McMMOHook.java index 8ca654d5e..7c540ddf4 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/McMMOHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/McMMOHook.java @@ -4,9 +4,9 @@ import com.gmail.nossr50.api.PartyAPI; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; -import me.NoChance.PvPManager.Dependencies.API.PvPDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.PvPDependency; import me.NoChance.PvPManager.Utils.Log; public class McMMOHook extends BaseDependency implements PvPDependency { diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/PlaceHolderAPIHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/PlaceHolderAPIHook.java index 095cbb228..af00d07b4 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/PlaceHolderAPIHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/PlaceHolderAPIHook.java @@ -1,9 +1,9 @@ package me.NoChance.PvPManager.Dependencies.Hooks; import me.NoChance.PvPManager.PvPManager; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.DependencyException; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; public class PlaceHolderAPIHook extends BaseDependency { diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/SaberFactionsHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/SaberFactionsHook.java index fa1a40182..d11e1fe8e 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/SaberFactionsHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/SaberFactionsHook.java @@ -7,9 +7,9 @@ import com.massivecraft.factions.zcore.persist.MemoryFPlayer; import com.massivecraft.factions.zcore.persist.MemoryFPlayers; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; -import me.NoChance.PvPManager.Dependencies.API.PvPDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.PvPDependency; public class SaberFactionsHook extends BaseDependency implements PvPDependency { diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/SimpleClansHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/SimpleClansHook.java index c805d0aa2..8395640c9 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/SimpleClansHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/SimpleClansHook.java @@ -2,11 +2,12 @@ import org.bukkit.entity.Player; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.DependencyException; -import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.PvPDependency; -import me.NoChance.PvPManager.Player.CancelResult; import me.NoChance.PvPManager.Dependencies.ForceToggleDependency; +import me.NoChance.PvPManager.Dependencies.Hook; +import me.NoChance.PvPManager.Dependencies.Interfaces.PvPDependency; +import me.NoChance.PvPManager.Player.ProtectionResult; import me.NoChance.PvPManager.Settings.Settings; import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer; import net.sacredlabyrinth.phaed.simpleclans.SimpleClans; @@ -37,7 +38,7 @@ public boolean shouldDisable(final Player player) { } @Override - public boolean shouldDisable(final Player attacker, final Player defender, final CancelResult reason) { + public boolean shouldDisable(final Player attacker, final Player defender, final ProtectionResult reason) { final ClanPlayer cAttacker = clanManager.getClanPlayer(attacker); final ClanPlayer cDefender = clanManager.getClanPlayer(defender); return cAttacker != null && cDefender != null && cAttacker.getClan().isWarring(cDefender.getClan()); diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/VaultHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/VaultHook.java index fd88dc684..053e78b27 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/VaultHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/VaultHook.java @@ -3,9 +3,9 @@ import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.DependencyException; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; import net.milkbowl.vault.economy.Economy; public class VaultHook extends BaseDependency { diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/WorldGuardLegacyHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/WorldGuardLegacyHook.java index 12ef81827..84520fd42 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/WorldGuardLegacyHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/WorldGuardLegacyHook.java @@ -14,10 +14,10 @@ import com.sk89q.worldguard.protection.flags.StateFlag.State; import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.DependencyException; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; -import me.NoChance.PvPManager.Dependencies.API.WorldGuardDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.WorldGuardDependency; import me.NoChance.PvPManager.Listeners.WGListenerLegacy; import me.NoChance.PvPManager.Managers.PlayerHandler; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/WorldGuardModernHook.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/WorldGuardModernHook.java index 8839f08d7..dd4f1970a 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/WorldGuardModernHook.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Hooks/WorldGuardModernHook.java @@ -13,10 +13,10 @@ import com.sk89q.worldguard.protection.regions.RegionQuery; import me.NoChance.PvPManager.PvPlayer; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.ForceToggleDependency; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; -import me.NoChance.PvPManager.Dependencies.API.WorldGuardDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.WorldGuardDependency; import me.NoChance.PvPManager.Listeners.WGListener; import me.NoChance.PvPManager.Managers.PlayerHandler; import me.NoChance.PvPManager.Player.ProtectionResult; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/Dependency.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/Dependency.java similarity index 84% rename from pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/Dependency.java rename to pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/Dependency.java index 9e64a453d..008baf048 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/Dependency.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/Dependency.java @@ -1,4 +1,4 @@ -package me.NoChance.PvPManager.Dependencies.API; +package me.NoChance.PvPManager.Dependencies.Interfaces; import org.bukkit.plugin.java.JavaPlugin; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/DisguiseDependency.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/DisguiseDependency.java similarity index 76% rename from pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/DisguiseDependency.java rename to pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/DisguiseDependency.java index 98c042cc4..351fc24d7 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/DisguiseDependency.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/DisguiseDependency.java @@ -1,4 +1,4 @@ -package me.NoChance.PvPManager.Dependencies.API; +package me.NoChance.PvPManager.Dependencies.Interfaces; import org.bukkit.entity.Player; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/GodDependency.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/GodDependency.java similarity index 79% rename from pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/GodDependency.java rename to pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/GodDependency.java index 28fda8aad..fb9115d2a 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/GodDependency.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/GodDependency.java @@ -1,4 +1,4 @@ -package me.NoChance.PvPManager.Dependencies.API; +package me.NoChance.PvPManager.Dependencies.Interfaces; import org.bukkit.entity.Player; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/PvPDependency.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/PvPDependency.java similarity index 73% rename from pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/PvPDependency.java rename to pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/PvPDependency.java index f71b11728..c3157cf4c 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/PvPDependency.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/PvPDependency.java @@ -1,4 +1,4 @@ -package me.NoChance.PvPManager.Dependencies.API; +package me.NoChance.PvPManager.Dependencies.Interfaces; import org.bukkit.entity.Player; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/RegionDependency.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/RegionDependency.java similarity index 84% rename from pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/RegionDependency.java rename to pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/RegionDependency.java index ac8f50454..5a0272571 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/RegionDependency.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/RegionDependency.java @@ -1,4 +1,4 @@ -package me.NoChance.PvPManager.Dependencies.API; +package me.NoChance.PvPManager.Dependencies.Interfaces; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/RegionPvPDependency.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/RegionPvPDependency.java similarity index 59% rename from pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/RegionPvPDependency.java rename to pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/RegionPvPDependency.java index b57bc04c0..4afc42741 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/RegionPvPDependency.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/RegionPvPDependency.java @@ -1,4 +1,4 @@ -package me.NoChance.PvPManager.Dependencies.API; +package me.NoChance.PvPManager.Dependencies.Interfaces; public interface RegionPvPDependency extends RegionDependency, PvPDependency { diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/WorldGuardDependency.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/WorldGuardDependency.java similarity index 92% rename from pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/WorldGuardDependency.java rename to pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/WorldGuardDependency.java index 75eee8b1c..a4f9639fe 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/API/WorldGuardDependency.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Dependencies/Interfaces/WorldGuardDependency.java @@ -1,4 +1,4 @@ -package me.NoChance.PvPManager.Dependencies.API; +package me.NoChance.PvPManager.Dependencies.Interfaces; import java.util.Set; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Libraries/Metrics/CustomMetrics.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Libraries/Metrics/CustomMetrics.java index e58dbadc7..507b1ee92 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Libraries/Metrics/CustomMetrics.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Libraries/Metrics/CustomMetrics.java @@ -11,7 +11,7 @@ import me.NoChance.PvPManager.PvPManager; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.Dependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.Dependency; import me.NoChance.PvPManager.Settings.Settings; public class CustomMetrics { diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/DebugEntityListener.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/DebugEntityListener.java index 59e4be878..cb7898983 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/DebugEntityListener.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/DebugEntityListener.java @@ -24,12 +24,13 @@ import me.NoChance.PvPManager.PvPlayer; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.WorldGuardDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.WorldGuardDependency; import me.NoChance.PvPManager.Managers.PlayerHandler; import me.NoChance.PvPManager.Player.ProtectionResult; import me.NoChance.PvPManager.Settings.Settings; import me.NoChance.PvPManager.Utils.CombatUtils; import me.NoChance.PvPManager.Utils.Log; +import me.NoChance.PvPManager.Utils.MCVersion; public class DebugEntityListener implements Listener { @@ -163,7 +164,7 @@ public void onDamageActions(final Player attacker, final Player defender) { public void onLightningStrike(final LightningStrikeEvent event) { if (CombatUtils.isWorldExcluded(event.getLightning().getWorld().getName())) return; - if (!CombatUtils.isVersionAtLeast(Settings.getMinecraftVersion(), "1.13.1")) + if (!MCVersion.isAtLeast(MCVersion.V1_13_1)) return; if (event.getCause() != Cause.TRIDENT) return; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/EntityListener.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/EntityListener.java index e8b0d8a21..b58f2fda1 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/EntityListener.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/EntityListener.java @@ -33,7 +33,7 @@ import me.NoChance.PvPManager.PvPlayer; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.WorldGuardDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.WorldGuardDependency; import me.NoChance.PvPManager.Managers.PlayerHandler; import me.NoChance.PvPManager.Player.ProtectionResult; import me.NoChance.PvPManager.Settings.Messages; @@ -228,7 +228,7 @@ private boolean shouldCheckPotionEvent(final PotionSplashEvent event) { public void onLightningStrike(final LightningStrikeEvent event) { if (CombatUtils.isWorldExcluded(event.getLightning().getWorld().getName())) return; - if (!CombatUtils.isMCVersionAtLeast(MCVersion.V1_13_1)) + if (!MCVersion.isAtLeast(MCVersion.V1_13_1)) return; if (event.getCause() != Cause.TRIDENT) return; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/MoveListener.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/MoveListener.java index 2c7e05c37..11b9cdd4a 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/MoveListener.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/MoveListener.java @@ -14,7 +14,7 @@ import me.NoChance.PvPManager.PvPlayer; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.RegionDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.RegionDependency; import me.NoChance.PvPManager.Managers.PlayerHandler; import me.NoChance.PvPManager.Settings.Messages; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/MoveListener1_9.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/MoveListener1_9.java index ed069f407..44da2c4ba 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/MoveListener1_9.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/MoveListener1_9.java @@ -16,7 +16,7 @@ import me.NoChance.PvPManager.PvPlayer; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.RegionDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.RegionDependency; import me.NoChance.PvPManager.Managers.PlayerHandler; import me.NoChance.PvPManager.Settings.Messages; import me.NoChance.PvPManager.Utils.CombatUtils; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/PlayerListener.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/PlayerListener.java index ea0c7a0dd..99d6912c7 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/PlayerListener.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/PlayerListener.java @@ -34,7 +34,7 @@ import me.NoChance.PvPManager.PvPlayer; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.WorldGuardDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.WorldGuardDependency; import me.NoChance.PvPManager.Managers.PlayerHandler; import me.NoChance.PvPManager.Player.ProtectionResult; import me.NoChance.PvPManager.Settings.Messages; @@ -55,9 +55,9 @@ public class PlayerListener implements Listener { public PlayerListener(final PlayerHandler ph) { this.ph = ph; this.wg = (WorldGuardDependency) ph.getPlugin().getDependencyManager().getDependency(Hook.WORLDGUARD); - if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_13)) { + if (MCVersion.isAtLeast(MCVersion.V1_13)) { mushroomSoup = Material.MUSHROOM_STEW; - } else if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_8)) { // avoid loading Material class on unit tests + } else if (MCVersion.isAtLeast(MCVersion.V1_8)) { // avoid loading Material class on unit tests mushroomSoup = Material.getMaterial("MUSHROOM_SOUP"); } } @@ -110,7 +110,7 @@ public final void onPlayerLogout(final PlayerQuitEvent event) { @EventHandler(priority = EventPriority.MONITOR) public final void onPlayerLogoutMonitor(final PlayerQuitEvent event) { - Bukkit.getScheduler().runTask(ph.getPlugin(), () -> ph.removeUser(ph.get(event.getPlayer()))); + ph.removeUser(ph.get(event.getPlayer())); } @EventHandler(priority = EventPriority.HIGH) @@ -175,7 +175,7 @@ public final void onPlayerUseSoup(final PlayerInteractEvent e) { player.getHealth() + Settings.getSoupHealth() > player.getMaxHealth() ? player.getMaxHealth() : player.getHealth() + Settings.getSoupHealth()); if (Settings.isSoupBowlDisappear()) { - if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_9)) { + if (MCVersion.isAtLeast(MCVersion.V1_9)) { player.getInventory().getItemInMainHand().setAmount(0); } else { player.getInventory().setItemInHand(null); @@ -275,7 +275,7 @@ public final void onPlayerTeleport(final PlayerTeleportEvent event) { if (event.getCause().equals(TeleportCause.ENDER_PEARL) && Settings.isBlockEnderPearl()) { event.setCancelled(true); pvplayer.message(Messages.getEnderpearlBlockedIncombat()); - } else if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_9) && event.getCause() == TeleportCause.CHORUS_FRUIT + } else if (MCVersion.isAtLeast(MCVersion.V1_9) && event.getCause() == TeleportCause.CHORUS_FRUIT && Settings.isBlockChorusFruit()) { event.setCancelled(true); pvplayer.message(Messages.getChorusBlockedInCombat()); diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DependencyManager.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DependencyManager.java index c1249ee68..5fb254770 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DependencyManager.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DependencyManager.java @@ -10,16 +10,11 @@ import org.bukkit.plugin.java.JavaPlugin; import me.NoChance.PvPManager.PvPManager; +import me.NoChance.PvPManager.Dependencies.BaseDependency; import me.NoChance.PvPManager.Dependencies.DependencyException; import me.NoChance.PvPManager.Dependencies.ForceToggleDependency; import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.API.BaseDependency; -import me.NoChance.PvPManager.Dependencies.API.Dependency; -import me.NoChance.PvPManager.Dependencies.API.DisguiseDependency; -import me.NoChance.PvPManager.Dependencies.API.GodDependency; -import me.NoChance.PvPManager.Dependencies.API.PvPDependency; -import me.NoChance.PvPManager.Dependencies.API.RegionDependency; -import me.NoChance.PvPManager.Dependencies.API.WorldGuardDependency; +import me.NoChance.PvPManager.Dependencies.Hooks.CooldownsXHook; import me.NoChance.PvPManager.Dependencies.Hooks.EssentialsHook; import me.NoChance.PvPManager.Dependencies.Hooks.FactionsUUIDHook; import me.NoChance.PvPManager.Dependencies.Hooks.GriefPreventionHook; @@ -31,6 +26,13 @@ import me.NoChance.PvPManager.Dependencies.Hooks.VaultHook; import me.NoChance.PvPManager.Dependencies.Hooks.WorldGuardLegacyHook; import me.NoChance.PvPManager.Dependencies.Hooks.WorldGuardModernHook; +import me.NoChance.PvPManager.Dependencies.Interfaces.Dependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.DisguiseDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.GodDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.PvPDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.RegionDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.WarDependency; +import me.NoChance.PvPManager.Dependencies.Interfaces.WorldGuardDependency; import me.NoChance.PvPManager.Listeners.MoveListener; import me.NoChance.PvPManager.Listeners.MoveListener1_9; import me.NoChance.PvPManager.Player.ProtectionResult; @@ -170,9 +172,9 @@ public final boolean shouldDisableProtection(final Player attacker, final Player public void startListeners(final PvPManager plugin) { if (Settings.borderHoppingPushback() && !regionChecks.isEmpty()) { - if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_9)) { + if (MCVersion.isAtLeast(MCVersion.V1_9)) { Bukkit.getPluginManager().registerEvents(new MoveListener1_9(plugin.getPlayerHandler()), plugin); - } else if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_8)) { + } else if (MCVersion.isAtLeast(MCVersion.V1_8)) { Bukkit.getPluginManager().registerEvents(new MoveListener(plugin.getPlayerHandler()), plugin); } else { Log.warning("Pushback on border hopping not available for 1.7.10 or below! Feature disabled!"); diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DisplayManager.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DisplayManager.java index ab08861e7..a533a3f85 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DisplayManager.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DisplayManager.java @@ -5,6 +5,7 @@ import org.bukkit.Bukkit; import org.bukkit.boss.BossBar; +import org.jetbrains.annotations.NotNull; import me.NoChance.PvPManager.PvPManager; import me.NoChance.PvPManager.PvPlayer; @@ -62,7 +63,7 @@ public void showProgress(final PvPlayer p, final double timePassed) { p.sendActionBar(ChatUtils.setPlaceholders(p.getPlayer(), message)); } - @NonNull + @NotNull public PvPManager getPlugin() { return plugin; } diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/PlayerHandler.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/PlayerHandler.java index 032dfb385..be7133a7a 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/PlayerHandler.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/PlayerHandler.java @@ -1,6 +1,7 @@ package me.NoChance.PvPManager.Managers; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; @@ -17,6 +18,8 @@ import me.NoChance.PvPManager.PvPManager; import me.NoChance.PvPManager.PvPlayer; +import me.NoChance.PvPManager.Dependencies.Hook; +import me.NoChance.PvPManager.Dependencies.Interfaces.WorldGuardDependency; import me.NoChance.PvPManager.Events.PlayerCombatLogEvent; import me.NoChance.PvPManager.Player.ProtectionResult; import me.NoChance.PvPManager.Settings.Settings; @@ -116,7 +119,7 @@ public final void removeUser(final PvPlayer player) { player.cleanForRemoval(); players.remove(player.getUUID()); if (player.isInCombat()) { - untag(player); + player.unTag(); } } diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Player/BasePlayer.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Player/BasePlayer.java index 538ce197c..1cb9a0da9 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Player/BasePlayer.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Player/BasePlayer.java @@ -45,8 +45,8 @@ public final void message(final String message) { } public void sendActionBar(final String message) { - if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_10) && !message.isEmpty()) { // Premium PvPManager supports lower versions with NMS - if (CombatUtils.isMCVersionAtLeast("1.16.5")) { + if (MCVersion.isAtLeast(MCVersion.V1_10) && !message.isEmpty()) { // Premium PvPManager supports lower versions with NMS + if (MCVersion.isAtLeast(MCVersion.V1_16_5)) { getPlayer().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(message)); } else { getPlayer().spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(message)); diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPManager.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPManager.java index 43175b034..01ae3f361 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPManager.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPManager.java @@ -25,7 +25,6 @@ import me.NoChance.PvPManager.Managers.PlayerHandler; import me.NoChance.PvPManager.Settings.Messages; import me.NoChance.PvPManager.Settings.Settings; -import me.NoChance.PvPManager.Utils.CombatUtils; import me.NoChance.PvPManager.Utils.Log; import me.chancesd.pvpmanager.managers.StorageManager; import me.chancesd.pvpmanager.managers.UpdateManager; @@ -80,12 +79,12 @@ private void loadFiles() { } private void startListeners() { - if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_9)) { + if (MCVersion.isAtLeast(MCVersion.V1_9)) { registerListener(new EntityListener1_9(playerHandler)); } entityListener = new EntityListener(playerHandler); registerListener(entityListener); - if (CombatUtils.isVersionAtLeast(Settings.getMinecraftVersion(), "1.11.2")) { + if (MCVersion.isAtLeast(MCVersion.V1_11_2)) { registerListener(new PlayerListener1_11(playerHandler)); } registerListener(new PlayerListener(playerHandler)); diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPlayer.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPlayer.java index 39a8bc160..7154f2512 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPlayer.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPlayer.java @@ -8,6 +8,7 @@ import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -102,7 +103,7 @@ public final void disableFly() { public final void setNewbie(final boolean newbie) { if (newbie) { this.newbieTask = new NewbieTask(this, 0); - message(Messages.getNewbieProtection(newbieTask.getFinishTime())); + message(Messages.getNewbieProtection(newbieTask.getFinishTime())); } else if (this.newbie && newbieTask != null) { if (newbieTask.isExpired()) { message(Messages.getNewbieProtectionEnd()); @@ -136,7 +137,7 @@ public final void setTagged(final boolean attacker, final PvPlayer tagger) { if (nametag != null && Settings.useNameTag()) { nametag.setInCombat(); } - if (Settings.isGlowingInCombat() && CombatUtils.isMCVersionAtLeast(MCVersion.V1_9)) { + if (Settings.isGlowingInCombat() && MCVersion.isAtLeast(MCVersion.V1_9)) { getPlayer().setGlowing(true); } @@ -166,7 +167,7 @@ public final void unTag() { if (nametag != null && Settings.useNameTag()) { nametag.restoreNametag(); } - if (Settings.isGlowingInCombat() && CombatUtils.isMCVersionAtLeast(MCVersion.V1_9)) { + if (Settings.isGlowingInCombat() && MCVersion.isAtLeast(MCVersion.V1_9)) { getPlayer().setGlowing(false); // effect should pass by itself but now players can get untagged before tag expires } @@ -245,9 +246,9 @@ public final boolean hasItemCooldown(final Material material) { return true; } - public final void setItemCooldown(@NonNull final Material material, final int time) { + public final void setItemCooldown(@NotNull final Material material, final int time) { itemCooldown.put(material, System.currentTimeMillis() + time * 1000); - if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_11_2)) { + if (MCVersion.isAtLeast(MCVersion.V1_11_2)) { getPlayer().setCooldown(material, time * 20); } } diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Messages.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Messages.java index 1fd8a2527..a8f8034d3 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Messages.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Messages.java @@ -100,7 +100,7 @@ public class Messages { private static String timeSeconds; private static String timeNow; private static String itemCooldown; - private static String prefix; + private static String prefix = "&6[&8PvPManager&6]"; public static void setup(final PvPManager plugin) { Messages.plugin = plugin; @@ -151,7 +151,7 @@ private static void load() { } @NotNull - private static String getString(final String key) { + public static String getString(final String key) { final String message = new String(LANG.getProperty(key).getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8); return ChatUtils.colorize(message).replace("%prefix%", Messages.getPrefix()); } @@ -293,12 +293,12 @@ public static String replaceTime(final String message, final long time) { return message.replace("%time%", TimeUtil.getDiffMsg(time)); } - @NonNull + @NotNull public static String replacePlayer(final String message, final String player) { return message.replace("%player%", player); } - @NonNull + @NotNull public static String replaceVictim(final String message, final String player) { return message.replace("", player); } @@ -311,7 +311,7 @@ public static String getPrefix() { return prefix; } - @NonNull + @NotNull public static String getErrorPlayerNotFound(final String name) { return replacePlayer(errorPlayerNotFound, name); } @@ -440,7 +440,7 @@ public static String getPushbackWarning() { return pushbackWarning; } - @NonNull + @NotNull public static String getErrorCommand() { return errorCommand; } @@ -574,7 +574,7 @@ public static String getDisabled() { public static String getPvPDisabledFee() { return pvpDisabledFee; } - + public static String getKillAbuseWarning() { return killAbuseWarning; } diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Settings.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Settings.java index 10ac66a4e..5a870cd54 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Settings.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Settings.java @@ -19,7 +19,6 @@ import me.NoChance.PvPManager.Dependencies.Hook; import me.NoChance.PvPManager.Utils.ChatUtils; -import me.NoChance.PvPManager.Utils.CombatUtils; import me.NoChance.PvPManager.Utils.Log; import me.NoChance.PvPManager.Utils.MCVersion; @@ -191,13 +190,10 @@ public static void initizalizeVariables(final Config c) { actionBarMessage = ChatUtils.colorize(TAGGEDCOMBAT.getString("Action Bar.Message", "")); actionBarSymbol = TAGGEDCOMBAT.getString("Action Bar.Symbol", "▊"); actionBarTotalBars = TAGGEDCOMBAT.getInt("Action Bar.Total Bars", 10); - bossBarEnabled = CombatUtils.isVersionAtLeast(Settings.getMinecraftVersion(), "1.9") && TAGGEDCOMBAT.getBoolean("Boss Bar.Enabled", true); + bossBarEnabled = MCVersion.isAtLeast(MCVersion.V1_9) && TAGGEDCOMBAT.getBoolean("Boss Bar.Enabled", true); bossBarMessage = ChatUtils.colorize(TAGGEDCOMBAT.getString("Boss Bar.Message", "")); - bossBarColor = CombatUtils.isVersionAtLeast(Settings.getMinecraftVersion(), "1.9") ? BarColor.valueOf(TAGGEDCOMBAT.getString("Boss Bar.BarColor", "RED")) - : null; - bossBarStyle = CombatUtils.isVersionAtLeast(Settings.getMinecraftVersion(), "1.9") - ? BarStyle.valueOf(TAGGEDCOMBAT.getString("Boss Bar.BarStyle", "SEGMENTED_10")) - : null; + bossBarColor = MCVersion.isAtLeast(MCVersion.V1_9) ? BarColor.valueOf(TAGGEDCOMBAT.getString("Boss Bar.BarColor", "RED")) : null; + bossBarStyle = MCVersion.isAtLeast(MCVersion.V1_9) ? BarStyle.valueOf(TAGGEDCOMBAT.getString("Boss Bar.BarStyle", "SEGMENTED_10")) : null; untagEnemy = TAGGEDCOMBAT.getBoolean("Untag Enemy", false); blockEnderPearl = TAGGEDCOMBAT.getBoolean("Block.EnderPearls", true); blockChorusFruit = TAGGEDCOMBAT.getBoolean("Block.ChorusFruits", true); @@ -225,7 +221,7 @@ public static void initizalizeVariables(final Config c) { final Material material = Material.getMaterial(e.getKey().toUpperCase()); if (material == null) { Log.warning("The material " + e.getKey() - + " in Item Cooldowns doesn't exist. You might have typed it incorrectly or it might not exist in this MC version"); + + " in Item Cooldowns doesn't exist. You might have typed it incorrectly or it might not exist in this MC version"); continue; } itemCooldowns.put(material, (Integer) e.getValue()); diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/CombatUtils.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/CombatUtils.java index a8d0552c8..71030ff5f 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/CombatUtils.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/CombatUtils.java @@ -22,7 +22,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffectType; import org.bukkit.projectiles.ProjectileSource; -import org.eclipse.jdt.annotation.NonNull; +import org.jetbrains.annotations.NotNull; import me.NoChance.PvPManager.Settings.Messages; import me.NoChance.PvPManager.Settings.Settings; @@ -102,7 +102,7 @@ public static final boolean isPvP(final EntityDamageByEntityEvent event) { if (defender instanceof Player && !isNPC(defender)) { if (attacker instanceof Player && !isNPC(attacker)) return true; - if (attacker instanceof Projectile || CombatUtils.isMCVersionAtLeast(MCVersion.V1_9) && attacker instanceof AreaEffectCloud) { + if (attacker instanceof Projectile || MCVersion.isAtLeast(MCVersion.V1_9) && attacker instanceof AreaEffectCloud) { final ProjectileSource projSource = getSource(attacker); if (projSource instanceof Player) { final Entity shooter = (Entity) projSource; @@ -176,19 +176,19 @@ public static void fakeItemStackDrop(final Player player, final ItemStack[] inve } } - public static boolean isOnline(@NonNull final String name) { + public static boolean isOnline(@NotNull final String name) { return Bukkit.getPlayer(name) != null; } public static boolean isOnlineWithFeedback(final CommandSender sender, final String name) { if (!isOnline(name)) { - sender.sendMessage(Messages.getErrorPlayerNotFound().replace("%p", name)); + sender.sendMessage(Messages.getErrorPlayerNotFound(name)); return false; } return true; } - public static boolean isOnline(@NonNull final UUID uuid) { + public static boolean isOnline(@NotNull final UUID uuid) { return Bukkit.getPlayer(uuid) != null; } @@ -241,10 +241,6 @@ public static final boolean isVersionAtLeast(final String v1, final String v2) { return true; } - public static final boolean isMCVersionAtLeast(final MCVersion version) { - return Settings.getMinecraftVersion().ordinal() >= version.ordinal(); - } - public static String stripTags(final String version) { return version.replaceAll("[-;+].+", ""); } diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/DateUtil.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/DateUtil.java deleted file mode 100644 index 8b1378917..000000000 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/DateUtil.java +++ /dev/null @@ -1 +0,0 @@ - diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/MCVersion.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/MCVersion.java index ee82a2898..1e4e42552 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/MCVersion.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Utils/MCVersion.java @@ -1,15 +1,25 @@ package me.NoChance.PvPManager.Utils; +import me.NoChance.PvPManager.Settings.Settings; + /** * Utility class to get and compare MC versions * * @author ChanceSD */ public enum MCVersion { - OLD, V1_8, V1_9, V1_10, V1_11, V1_11_2, V1_12, V1_13, V1_13_1, V1_14, V1_15, V1_16; + OLD, V1_8, V1_9, V1_10, V1_11, V1_11_2, V1_12, V1_13, V1_13_1, V1_14, V1_15, V1_16, V1_16_5, V1_17, V1_18, V1_19; public static MCVersion getMCVersion(final String version) { - if (CombatUtils.isVersionAtLeast(version, "1.16")) + if (CombatUtils.isVersionAtLeast(version, "1.19")) + return MCVersion.V1_19; + else if (CombatUtils.isVersionAtLeast(version, "1.18")) + return MCVersion.V1_18; + else if (CombatUtils.isVersionAtLeast(version, "1.17")) + return MCVersion.V1_17; + else if (CombatUtils.isVersionAtLeast(version, "1.16.5")) + return MCVersion.V1_16_5; + else if (CombatUtils.isVersionAtLeast(version, "1.16")) return MCVersion.V1_16; else if (CombatUtils.isVersionAtLeast(version, "1.15")) return MCVersion.V1_15; @@ -33,4 +43,13 @@ else if (CombatUtils.isVersionAtLeast(version, "1.8")) return MCVersion.V1_8; return MCVersion.OLD; } + + public static final boolean isAtLeast(final MCVersion version) { + return Settings.getMinecraftVersion().ordinal() >= version.ordinal(); + } + + public static final boolean isLessThan(final MCVersion version) { + return Settings.getMinecraftVersion().ordinal() < version.ordinal(); + } + } diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java index db6aecf1c..1bc39e619 100644 --- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java +++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java @@ -10,7 +10,6 @@ import me.NoChance.PvPManager.PvPlayer; import me.NoChance.PvPManager.Settings.Settings; -import me.NoChance.PvPManager.Utils.CombatUtils; import me.NoChance.PvPManager.Utils.Log; import me.NoChance.PvPManager.Utils.MCVersion; @@ -44,7 +43,7 @@ private void setup() { inCombat = scoreboard.registerNewTeam(combatTeamID); Log.debug("Creating combat team with name " + combatTeamID); inCombat.setPrefix(combatPrefix); - if (CombatUtils.isVersionAtLeast(Settings.getMinecraftVersion(), "1.13")) { + if (MCVersion.isAtLeast(MCVersion.V1_13)) { final ChatColor nameColor = getLastColor(combatPrefix); if (nameColor != null) { inCombat.setColor(nameColor); @@ -60,7 +59,7 @@ private void setup() { pvpOn = scoreboard.registerNewTeam(PVPON); pvpOn.setCanSeeFriendlyInvisibles(false); pvpOn.setPrefix(pvpOnPrefix); - if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_13)) { + if (MCVersion.isAtLeast(MCVersion.V1_13)) { final ChatColor nameColor = getLastColor(pvpOnPrefix); if (nameColor != null) { pvpOn.setColor(nameColor); @@ -75,7 +74,7 @@ private void setup() { pvpOff = scoreboard.registerNewTeam(PVPOFF); pvpOff.setCanSeeFriendlyInvisibles(false); pvpOff.setPrefix(pvpOffPrefix); - if (CombatUtils.isMCVersionAtLeast(MCVersion.V1_13)) { + if (MCVersion.isAtLeast(MCVersion.V1_13)) { final ChatColor nameColor = getLastColor(pvpOffPrefix); if (nameColor != null) { pvpOff.setColor(nameColor); diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/storage/Database.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/storage/Database.java index 300ea7ba3..a21802749 100644 --- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/storage/Database.java +++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/storage/Database.java @@ -24,8 +24,7 @@ import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import me.NoChance.PvPManager.Settings.Settings; -import me.NoChance.PvPManager.Utils.CombatUtils; +import me.NoChance.PvPManager.Utils.MCVersion; import me.chancesd.pvpmanager.storage.DatabaseConfigBuilder.DatabaseType; public class Database { @@ -45,7 +44,7 @@ protected Database(final DatabaseFactory databaseFactory, final DatabaseConfigBu final HikariConfig config = new HikariConfig(); if (databaseType == DatabaseType.SQLITE) { // Use SQLITE - if (!CombatUtils.isVersionAtLeast(Settings.getMinecraftVersion(), "1.9")) { + if (MCVersion.isLessThan(MCVersion.V1_9)) { try { Class.forName("org.sqlite.JDBC"); // got to do this for 1.8 sigh config.setConnectionTestQuery("SELECT 1;"); @@ -54,7 +53,7 @@ protected Database(final DatabaseFactory databaseFactory, final DatabaseConfigBu } } config.setJdbcUrl(String.format(SQLITE_URL_TEMPLATE, builder.getFile())); - if (CombatUtils.isVersionAtLeast(Settings.getMinecraftVersion(), "1.9")) { + if (MCVersion.isAtLeast(MCVersion.V1_9)) { config.addDataSourceProperty("journal_mode", "wal"); } config.addDataSourceProperty("synchronous", "normal"); diff --git a/pvpmanager/src/test/java/me/NoChance/PvPManager/Listeners/PlayerListenerTest.java b/pvpmanager/src/test/java/me/NoChance/PvPManager/Listeners/PlayerListenerTest.java index 9edca49d3..4324a8105 100644 --- a/pvpmanager/src/test/java/me/NoChance/PvPManager/Listeners/PlayerListenerTest.java +++ b/pvpmanager/src/test/java/me/NoChance/PvPManager/Listeners/PlayerListenerTest.java @@ -73,11 +73,10 @@ void onPlayerLogoutTest() { listener.onPlayerLogout(new PlayerQuitEvent(defender, "")); verify(defender, times(1)).setHealth(0); - assertFalse(pvPlayer.isInCombat()); + assertEquals(2, ph.getPlayers().size()); // attacker and defender + listener.onPlayerLogoutMonitor(new PlayerQuitEvent(defender, "")); assertEquals(1, ph.getPlayers().size()); - listener.onPlayerLogout(new PlayerQuitEvent(attacker, "")); - assertEquals(0, ph.getPlayers().size()); } @Test