More changes

ChanceSD · Sep 23, 2023 · 985fbde · 985fbde
1 parent 967a118
commit 985fbde
Show file tree

Hide file tree

Showing 40 changed files with 118 additions and 103 deletions.
diff --git a/...ager/Dependencies/API/BaseDependency.java → ...PManager/Dependencies/BaseDependency.java b/...ager/Dependencies/API/BaseDependency.java → ...PManager/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...PManager/Dependencies/API/Dependency.java → ...r/Dependencies/Interfaces/Dependency.java b/...PManager/Dependencies/API/Dependency.java → ...r/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/.../Dependencies/API/DisguiseDependency.java → ...encies/Interfaces/DisguiseDependency.java b/.../Dependencies/API/DisguiseDependency.java → ...encies/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/...nager/Dependencies/API/GodDependency.java → ...ependencies/Interfaces/GodDependency.java b/...nager/Dependencies/API/GodDependency.java → ...ependencies/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/...nager/Dependencies/API/PvPDependency.java → ...ependencies/Interfaces/PvPDependency.java b/...nager/Dependencies/API/PvPDependency.java → ...ependencies/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/...er/Dependencies/API/RegionDependency.java → ...ndencies/Interfaces/RegionDependency.java b/...er/Dependencies/API/RegionDependency.java → ...ndencies/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/...Dependencies/API/RegionPvPDependency.java → ...ncies/Interfaces/RegionPvPDependency.java b/...Dependencies/API/RegionPvPDependency.java → ...ncies/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/...ependencies/API/WorldGuardDependency.java → ...cies/Interfaces/WorldGuardDependency.java b/...ependencies/API/WorldGuardDependency.java → ...cies/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 	}