Skip to content

Commit

Permalink
More changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ChanceSD committed Mar 26, 2024
1 parent 1edcbdb commit f2237de
Show file tree
Hide file tree
Showing 43 changed files with 128 additions and 107 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import org.bukkit.entity.Player;

import me.NoChance.PvPManager.Dependencies.Interfaces.Dependency;

public interface AFKDependency extends Dependency {

public boolean isAFK(Player player);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package me.NoChance.PvPManager.Dependencies.API;
package me.NoChance.PvPManager.Dependencies;

import org.bukkit.ChatColor;
import org.bukkit.plugin.java.JavaPlugin;

import me.chancesd.sdutils.utils.Log;
import me.NoChance.PvPManager.Dependencies.Interfaces.Dependency;

public class BaseDependency implements Dependency {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import com.github.sirblobman.cooldowns.api.configuration.ICooldownSettings;
import com.github.sirblobman.cooldowns.api.data.ICooldownData;

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.Settings.Settings;

public class CooldownsXHook extends BaseDependency {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

import me.NoChance.PvPManager.Dependencies.AFKDependency;
import me.NoChance.PvPManager.Dependencies.BaseDependency;
import me.NoChance.PvPManager.Dependencies.GodDependency;
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 AFKDependency, GodDependency {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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.chancesd.sdutils.utils.Log;
import me.ryanhamshire.GriefPrevention.GriefPrevention;

public class GriefPreventionHook extends BaseDependency {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

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.chancesd.sdutils.utils.Log;
import me.NoChance.PvPManager.Dependencies.Interfaces.DisguiseDependency;
import me.libraryaddict.disguise.DisguiseAPI;

public class LibsDisguisesHook extends BaseDependency implements DisguiseDependency {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

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.chancesd.sdutils.utils.Log;
import me.NoChance.PvPManager.Dependencies.Interfaces.PvPDependency;

public class McMMOHook extends BaseDependency implements PvPDependency {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

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;
import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
Expand Down Expand Up @@ -36,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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import me.NoChance.PvPManager.Dependencies.BaseDependency;
import me.NoChance.PvPManager.Dependencies.Hook;
import me.NoChance.PvPManager.Player.CancelResult;
import me.NoChance.PvPManager.Player.ProtectionResult;
import me.NoChance.PvPManager.Dependencies.ForceToggleDependency;

public class TownyHook extends BaseDependency implements ForceToggleDependency {
Expand All @@ -25,7 +25,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) {
return shouldDisable(attacker) && shouldDisable(defender);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.NoChance.PvPManager.Dependencies.API;
package me.NoChance.PvPManager.Dependencies.Interfaces;

import org.bukkit.plugin.java.JavaPlugin;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.NoChance.PvPManager.Dependencies.API;
package me.NoChance.PvPManager.Dependencies.Interfaces;

import org.bukkit.entity.Player;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.NoChance.PvPManager.Dependencies.API;
package me.NoChance.PvPManager.Dependencies.Interfaces;

import org.bukkit.entity.Player;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.NoChance.PvPManager.Dependencies.API;
package me.NoChance.PvPManager.Dependencies.Interfaces;

import org.bukkit.entity.Player;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.NoChance.PvPManager.Dependencies.API;
package me.NoChance.PvPManager.Dependencies.Interfaces;

public interface RegionPvPDependency extends RegionDependency, PvPDependency {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.NoChance.PvPManager.Dependencies.API;
package me.NoChance.PvPManager.Dependencies.Interfaces;

import java.util.Set;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
import me.chancesd.sdutils.metrics.Metrics;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.chancesd.sdutils.utils.Log;
import me.NoChance.PvPManager.Utils.MCVersion;

public class DebugEntityListener implements Listener {

Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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;
Expand Down Expand Up @@ -230,7 +230,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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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;
Expand All @@ -57,9 +57,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");
}
}
Expand Down Expand Up @@ -127,7 +127,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)
Expand Down Expand Up @@ -192,7 +192,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);
Expand Down Expand Up @@ -289,7 +289,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());
Expand Down
Loading

0 comments on commit f2237de

Please sign in to comment.