Handle most IDE warnings

pvpmanager/pom.xml

@@ -237,7 +237,7 @@
 		<dependency>
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
-			<version>4.0.3</version>
+			<version>5.1.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

pvpmanager/src/main/java/me/chancesd/pvpmanager/PvPManager.java

@@ -3,9 +3,6 @@
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.PluginCommand;
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.java.JavaPlugin;
-
 import me.chancesd.pvpmanager.command.Announce;
 import me.chancesd.pvpmanager.command.Newbie;
 import me.chancesd.pvpmanager.command.PM;
@@ -32,10 +29,11 @@
 import me.chancesd.pvpmanager.setting.Messages;
 import me.chancesd.pvpmanager.utils.ScheduleUtils;
 import me.chancesd.sdutils.library.PluginLibraries;
+import me.chancesd.sdutils.plugin.SDPlugin;
 import me.chancesd.sdutils.utils.Log;
 import me.chancesd.sdutils.utils.MCVersion;
 
-public class PvPManager extends JavaPlugin {
+public class PvPManager extends SDPlugin {
 
 	private ConfigManager configM;
 	private PlayerManager playerHandler;
@@ -66,13 +64,12 @@ public void onEnable() {
 		updateManager = new UpdateManager(this);
 		storageManager = new StorageManager(this);
 		dependencyManager = new DependencyManager();
-		displayManager = new DisplayManager(this);
+		displayManager = new DisplayManager();
 		worldManager = new WorldManager(this);
 		playerHandler = new PlayerManager(this);
 		startListeners();
 		registerCommands();
 		startMetrics();
-		checkJavaVersion();
 		Log.infoColor(ChatColor.GREEN + getDescription().getFullName() + " enabled " + ChatColor.GRAY + "("
 				+ (System.currentTimeMillis() - start) + " ms)");
 	}
@@ -121,37 +118,6 @@ private void startMetrics() {
 		new CustomMetrics(this);
 	}
 
-	private void checkJavaVersion() {
-		int javaVersion;
-		String version = System.getProperty("java.version");
-		if (version.startsWith("1.")) {
-			version = version.substring(2, 3);
-		} else {
-			final int dot = version.indexOf(".");
-			if (dot != -1) {
-				version = version.substring(0, dot);
-			} else {
-				final int separator = version.indexOf("-");
-				if (separator != -1) {
-					version = version.substring(0, separator);
-				}
-			}
-		}
-		try {
-			javaVersion = Integer.parseInt(version);
-		} catch (final NumberFormatException e) {
-			return;
-		}
-		if (javaVersion < 16) {
-			Log.severe("You appear to be using Java 15 or lower. For now the plugin still works but please update to Java 16+");
-			Log.severe("In the future PvPManager will stop supporting Java versions this old");
-		}
-	}
-
-	private void registerListener(final Listener listener) {
-		this.getServer().getPluginManager().registerEvents(listener, this);
-	}
-
 	private void registerCommand(final PluginCommand command, final CommandExecutor executor) {
 		if (command == null)
 			return;

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Newbie.java

@@ -29,8 +29,8 @@ public Newbie(final PlayerManager ph) {
 
 	@Override
 	public final boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args) {
-		if (args.length == 0 && sender instanceof Player) {
-			final CombatPlayer pvPlayer = ph.get((Player) sender);
+		if (args.length == 0 && sender instanceof final Player player) {
+			final CombatPlayer pvPlayer = ph.get(player);
 			if (!pvPlayer.isNewbie()) {
 				pvPlayer.message(Messages.getErrorNotNewbie());
 			} else {
@@ -40,13 +40,13 @@ public final boolean onCommand(final CommandSender sender, final Command command
 			return true;
 		} else if (args.length >= 1) {
 			final String subcommand = args[0];
-			if (Settings.isNewbieDisableAllowed() && subcommand.equalsIgnoreCase("disable") && sender instanceof Player) {
-				final CombatPlayer player = ph.get((Player) sender);
-				if (player.isNewbie()) {
-					player.setNewbie(false);
+			if (Settings.isNewbieDisableAllowed() && subcommand.equalsIgnoreCase("disable") && sender instanceof final Player player) {
+				final CombatPlayer combatPlayer = ph.get(player);
+				if (combatPlayer.isNewbie()) {
+					combatPlayer.setNewbie(false);
 					return true;
 				}
-				player.message(Messages.getErrorNotNewbie());
+				combatPlayer.message(Messages.getErrorNotNewbie());
 				return true;
 			} else if (Permissions.ADMIN.hasPerm(sender) && args.length == 2) {
 				if (subcommand.equalsIgnoreCase("checktime")) {

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PM.java

@@ -13,6 +13,8 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.damage.DamageSource;
+import org.bukkit.damage.DamageType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
@@ -48,12 +50,9 @@ public PM(final PvPManager plugin) {
 
 	@Override
 	public final boolean onCommand(final CommandSender sender, final Command cmd, final String label, final String[] args) {
-		if (sender instanceof Player) {
-			final Player player = (Player) sender;
-			if (args.length == 0 && player.hasPermission("pvpmanager.menu")) {
-				Settings.helpMenu(player);
-				return true;
-			}
+		if (args.length == 0 && sender.hasPermission("pvpmanager.menu")) {
+			Settings.helpMenu(sender);
+			return true;
 		}
 		if (args.length == 1) {
 			if (args[0].equalsIgnoreCase("reload")) {
@@ -79,7 +78,7 @@ public final boolean onCommand(final CommandSender sender, final Command cmd, fi
 				locale(sender, args);
 				return true;
 			} else if (args[0].equalsIgnoreCase("worlds") && Permissions.ADMIN.hasPerm(sender)) {
-				worldsSubcommand.onCommand(sender, cmd, label, args);
+				worldsSubcommand.onCommand(sender, args);
 				return true;
 			}
 		}
@@ -162,13 +161,13 @@ private void convert(final CommandSender sender, final String[] args) {
 
 	private void debug(final CommandSender sender, final String[] args) {
 		CombatPlayer p = null;
-		if (args.length == 2 && sender instanceof Player) {
-			p = plugin.getPlayerHandler().get((Player) sender);
+		if (args.length == 2 && sender instanceof final Player player) {
+			p = plugin.getPlayerHandler().get(player);
 		}
 		if (args.length == 2 && args[1].equalsIgnoreCase("toggle")) {
-			Settings.setDEBUG(!Settings.DEBUG);
-			Log.info("Debug mode: " + Settings.DEBUG);
-			sender.sendMessage("Debug mode: " + Settings.DEBUG);
+			Settings.setDEBUG(!Settings.isDebug());
+			Log.info("Debug mode: " + Settings.isDebug());
+			sender.sendMessage("Debug mode: " + Settings.isDebug());
 		} else if (args.length == 2 && args[1].equalsIgnoreCase("damagedebug")) {
 			if (damageListener == null) {
 				sender.sendMessage("§4Warning §f- Some plugin features are disabled while in this mode");
@@ -203,7 +202,8 @@ private void debug(final CommandSender sender, final String[] args) {
 			p.setTagged(true, p);
 		} else if (args[1].equalsIgnoreCase("attack")) {
 			plugin.getServer().getPluginManager()
-					.callEvent(new EntityDamageByEntityEvent(p.getPlayer(), p.getPlayer(), DamageCause.ENTITY_ATTACK, 5.0));
+					.callEvent(new EntityDamageByEntityEvent(p.getPlayer(), p.getPlayer(), DamageCause.ENTITY_ATTACK,
+							DamageSource.builder(DamageType.PLAYER_ATTACK).build(), 5.0));
 			sender.sendMessage("Attacked player with 5 damage");
 		} else if (args[1].equalsIgnoreCase("players")) {
 			for (final CombatPlayer player : plugin.getPlayerHandler().getPlayers().values()) {

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvP.java

@@ -35,16 +35,15 @@ public final boolean onCommand(final CommandSender sender, final Command cmd, fi
 			return true;
 		}
 
-		if (sender instanceof Player && args.length == 0) {
-			final Player player = (Player) sender;
+		if (sender instanceof final Player player && args.length == 0) {
 			final CombatPlayer pvpPlayer = ph.get(player);
 			togglePvP(pvpPlayer, !pvpPlayer.hasPvPEnabled());
 			return true;
 		}
 
 		if (args.length == 1) {
-			if (sender instanceof Player && (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("on"))) {
-				final CombatPlayer pvpPlayer = ph.get((Player) sender);
+			if (sender instanceof final Player player && (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("on"))) {
+				final CombatPlayer pvpPlayer = ph.get(player);
 				final boolean state = args[0].equalsIgnoreCase("on");
 				togglePvP(pvpPlayer, state);
 				return true;

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPInfo.java

@@ -2,15 +2,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
-
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import com.google.common.base.Preconditions;
+
 import me.chancesd.pvpmanager.manager.PlayerManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.setting.Messages;
@@ -28,11 +28,12 @@ public PvPInfo(final PlayerManager ph) {
 
 	@Override
 	public final boolean onCommand(final CommandSender sender, final Command cmd, final String label, final String[] args) {
-		if (args.length == 0 && sender instanceof Player) {
-			sendInfo(sender, ph.get((Player) sender));
+		if (args.length == 0 && sender instanceof final Player player) {
+			sendInfo(sender, ph.get(player));
 			return true;
 		} else if (args.length == 1 && sender.hasPermission("pvpmanager.info.others")) {
 			final String name = args[0];
+			Preconditions.checkNotNull(name);
 			if (CombatUtils.isOnline(name)) {
 				sendInfo(sender, ph.get(Bukkit.getPlayer(name)));
 				return true;
@@ -53,7 +54,7 @@ private void sendInfo(final CommandSender sender, final CombatPlayer target) {
 		sender.sendMessage(Messages.getString("PvPInfo_Line6") + target.getPlayer().getWorld().getName());
 		sender.sendMessage(Messages.getString("PvPInfo_Line7") + target.hasOverride());
 		sender.sendMessage(ChatUtils.colorize("&2- Enemies: &7"
-				+ (target.getEnemies().isEmpty() ? "&cNone" : target.getEnemies().stream().map(CombatPlayer::getName).collect(Collectors.toList()))));
+				+ (target.getEnemies().isEmpty() ? "&cNone" : target.getEnemies().stream().map(CombatPlayer::getName).toList())));
 		sender.sendMessage(ChatUtils.colorize("&2- Exempt Perms: &7" + getExemptions(target.getPlayer())));
 
 	}

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Worlds.java

@@ -7,18 +7,17 @@
 import me.chancesd.pvpmanager.setting.Messages;
 import me.chancesd.pvpmanager.world.CombatWorld;
 import me.chancesd.pvpmanager.world.CombatWorld.WorldOptionState;
+import me.chancesd.sdutils.utils.Log;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.*;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.chat.hover.content.Text;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class Worlds {
 
@@ -38,7 +37,11 @@ public void createWorldMenu(final Player player) {
 					ChatColor.DARK_AQUA + "" + ChatColor.BOLD + "World: " + ChatColor.GOLD + combatWorld.getName() + ChatColor.AQUA + " \n  ");
 
 			final World world = Bukkit.getWorld(combatWorld.getName());
-			final List<CombatPlayer> pvPlayerList = world.getPlayers().stream().map(p -> plugin.getPlayerHandler().get(p)).collect(Collectors.toList());
+			if (world == null) {
+				Log.warning("Null world in world list!");
+				continue;
+			}
+			final List<CombatPlayer> pvPlayerList = world.getPlayers().stream().map(p -> plugin.getPlayerHandler().get(p)).toList();
 			worldItem.addExtra(createInfoText("Players", pvPlayerList.size()));
 			worldItem.addExtra(createSeparator());
 			worldItem.addExtra(createInfoText("In Combat", pvPlayerList.stream().filter(CombatPlayer::isInCombat).count()));
@@ -120,15 +123,15 @@ private TextComponent createSeparator() {
 		return new TextComponent(ChatColor.DARK_GRAY + " | ");
 	}
 
-	public final boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args) {
+	public final void onCommand(final CommandSender sender, final String[] args) {
 		if (args.length == 5) {
 			final String subcommand = args[1];
 			if (subcommand.equalsIgnoreCase("set")) {
 				final String world = args[2];
 				final CombatWorld combatWorld = plugin.getWorldManager().getWorld(world);
 				if (combatWorld == null) {
 					sender.sendMessage(Messages.PREFIXMSG + ChatColor.RED + "There is no world with that name");
-					return true;
+					return;
 				}
 				final String option = args[3];
 				if (option.equalsIgnoreCase("PvP")) {
@@ -142,10 +145,8 @@ public final boolean onCommand(final CommandSender sender, final Command command
 				}
 			}
 		}
-		if (sender instanceof Player) {
-			createWorldMenu((Player) sender);
+		if (sender instanceof final Player player) {
+			createWorldMenu(player);
 		}
-
-		return true;
 	}
 }

pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/ForceToggleDependency.java

@@ -1,15 +1,16 @@
 package me.chancesd.pvpmanager.integration;
 
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import me.chancesd.pvpmanager.integration.type.Dependency;
 import me.chancesd.pvpmanager.player.ProtectionType;
 
 public interface ForceToggleDependency extends Dependency {
 
-	public boolean shouldDisable(Player player);
+	public boolean shouldDisable(@NotNull Player player);
 
-	public boolean shouldDisable(Player attacker, Player defender, ProtectionType reason);
+	public boolean shouldDisable(@NotNull Player attacker, @NotNull Player defender, ProtectionType reason);
 
 	public default boolean shouldDisableProtection() {
 		return getConfigBoolean("No Protection In War", true);

pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/PlaceHolderAPI.java

@@ -5,6 +5,7 @@
 import java.util.List;
 
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import me.chancesd.pvpmanager.PvPManager;
 import me.chancesd.pvpmanager.player.CombatPlayer;
@@ -16,6 +17,7 @@
 public class PlaceHolderAPI extends PlaceholderExpansion {
 
 	private final PvPManager plugin;
+	@NotNull
 	private final List<String> placeholders = new ArrayList<>();
 	private final DecimalFormat df = new DecimalFormat("#.##");
 
@@ -92,6 +94,7 @@ public boolean canRegister() {
 		return true;
 	}
 
+	@SuppressWarnings("null")
 	@Override
 	public String getAuthor() {
 		return plugin.getDescription().getAuthors().toString();

pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/SimpleClansHook.java

@@ -12,6 +12,7 @@
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
 
+@SuppressWarnings("null") // getClan can't be null because clan player isn't null
 public class SimpleClansHook extends BaseDependency implements GroupDependency, ForceToggleDependency {
 
 	private final ClanManager clanManager;

pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/TownyHook.java

@@ -18,6 +18,7 @@ public TownyHook(final Hook hook) {
 		townyAPI = TownyAPI.getInstance();
 	}
 
+	@SuppressWarnings("null") // already check if resident has town
 	@Override
 	public boolean shouldDisable(final Player player) {
 		final Resident resident = townyAPI.getResident(player);

pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/WGListener.java → pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/worldguard/WGListener.java

@@ -1,4 +1,4 @@
-package me.chancesd.pvpmanager.listener;
+package me.chancesd.pvpmanager.integration.hook.worldguard;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/WGListenerLegacy.java → pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/worldguard/WGListenerLegacy.java

@@ -1,4 +1,4 @@
-package me.chancesd.pvpmanager.listener;
+package me.chancesd.pvpmanager.integration.hook.worldguard;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/WorldGuardLegacyHook.java → pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/worldguard/WorldGuardLegacyHook.java

@@ -1,4 +1,4 @@
-package me.chancesd.pvpmanager.integration.hook;
+package me.chancesd.pvpmanager.integration.hook.worldguard;
 
 import java.lang.reflect.Method;
 import java.util.Set;
@@ -18,7 +18,6 @@
 import me.chancesd.pvpmanager.integration.DependencyException;
 import me.chancesd.pvpmanager.integration.Hook;
 import me.chancesd.pvpmanager.integration.type.WorldGuardDependency;
-import me.chancesd.pvpmanager.listener.WGListenerLegacy;
 import me.chancesd.pvpmanager.manager.PlayerManager;
 
 public class WorldGuardLegacyHook extends BaseDependency implements WorldGuardDependency {