Rename spigot players

I think ISpigotPlayer is "weird" to use, SpigotPlayerImpl will rarely be used as SpigotPlayer (The new interface) already provides all methods

platforms/spigot/src/main/java/net/codersky/skyutils/spigot/SpigotUtils.java

@@ -13,8 +13,8 @@
 import net.codersky.skyutils.spigot.console.SpigotConsole;
 import net.codersky.skyutils.spigot.console.SpigotConsoleProvider;
 import net.codersky.skyutils.spigot.player.CustomSpigotPlayerProvider;
-import net.codersky.skyutils.spigot.player.IOfflineSpigotPlayer;
-import net.codersky.skyutils.spigot.player.ISpigotPlayer;
+import net.codersky.skyutils.spigot.player.OfflineSpigotPlayer;
+import net.codersky.skyutils.spigot.player.SpigotPlayer;
 import net.codersky.skyutils.spigot.time.SpigotTaskScheduler;
 import net.codersky.skyutils.spigot.worldgen.SingleBiomeProvider;
 import net.codersky.skyutils.spigot.worldgen.VoidGenerator;
@@ -75,30 +75,30 @@ public File getDataFolder() {
 	 */
 
 	@NotNull
-	public CustomSpigotPlayerProvider<? extends ISpigotPlayer, ? extends IOfflineSpigotPlayer> getPlayerProvider() {
+	public CustomSpigotPlayerProvider<? extends SpigotPlayer, ? extends OfflineSpigotPlayer> getPlayerProvider() {
 		return SkyUtilsSpigot.getInstance().getPlayerProvider();
 	}
 
 	@NotNull
 	@Override
-	public Collection<? extends ISpigotPlayer> getOnlinePlayers() {
+	public Collection<? extends SpigotPlayer> getOnlinePlayers() {
 		return getPlayerProvider().getOnlineCache();
 	}
 
 	@Nullable
 	@Override
-	public ISpigotPlayer getPlayer(@NotNull UUID uuid) {
+	public SpigotPlayer getPlayer(@NotNull UUID uuid) {
 		return getPlayerProvider().getOnline(uuid);
 	}
 
 	@Nullable
-	public ISpigotPlayer getPlayer(@NotNull Player bukkit) {
+	public SpigotPlayer getPlayer(@NotNull Player bukkit) {
 		return getPlayer(bukkit.getUniqueId());
 	}
 
 	@Nullable
 	@Override
-	public ISpigotPlayer getPlayer(@NotNull String name) {
+	public SpigotPlayer getPlayer(@NotNull String name) {
 		final Player bukkit = Bukkit.getPlayer(name);
 		return bukkit == null ? null : getPlayer(bukkit);
 	}

platforms/spigot/src/main/java/net/codersky/skyutils/spigot/player/CustomSpigotPlayerProvider.java

@@ -14,7 +14,7 @@
 
 import java.util.UUID;
 
-public abstract class CustomSpigotPlayerProvider<ON extends ISpigotPlayer, OFF extends IOfflineSpigotPlayer>
+public abstract class CustomSpigotPlayerProvider<ON extends SpigotPlayer, OFF extends OfflineSpigotPlayer>
 		extends PlayerProvider<Player, ON, OfflinePlayer, OFF> implements Listener {
 
 	public CustomSpigotPlayerProvider(@NotNull TaskScheduler scheduler) {

platforms/spigot/src/main/java/net/codersky/skyutils/spigot/player/OfflineSpigotPlayer.java

@@ -1,19 +1,38 @@
 package net.codersky.skyutils.spigot.player;
 
+import net.codersky.skyutils.crossplatform.player.OfflineSkyPlayer;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-public class OfflineSpigotPlayer implements IOfflineSpigotPlayer {
+import java.util.UUID;
 
-	private final OfflinePlayer handle;
+public interface OfflineSpigotPlayer extends OfflineSkyPlayer {
 
-	protected OfflineSpigotPlayer(@NotNull OfflinePlayer handle) {
-		this.handle = handle;
+	@NotNull
+	OfflinePlayer getHandle();
+
+	@Nullable
+	default Player getOnlineHandle() {
+		return getHandle().getPlayer();
 	}
 
 	@NotNull
 	@Override
-	public OfflinePlayer getHandle() {
-		return handle;
+	default UUID getUniqueId() {
+		return getHandle().getUniqueId();
+	}
+
+	@NotNull
+	@Override
+	default String getName() {
+		final String name = getHandle().getName();
+		return name == null ? "" : name;
+	}
+
+	@Override
+	default boolean isOnline() {
+		return getHandle().isOnline();
 	}
 }

platforms/spigot/src/main/java/net/codersky/skyutils/spigot/player/OfflineSpigotPlayerImpl.java

@@ -0,0 +1,19 @@
+package net.codersky.skyutils.spigot.player;
+
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+
+public class OfflineSpigotPlayerImpl implements OfflineSpigotPlayer {
+
+	private final OfflinePlayer handle;
+
+	protected OfflineSpigotPlayerImpl(@NotNull OfflinePlayer handle) {
+		this.handle = handle;
+	}
+
+	@NotNull
+	@Override
+	public OfflinePlayer getHandle() {
+		return handle;
+	}
+}

platforms/spigot/src/main/java/net/codersky/skyutils/spigot/player/SpigotPlayer.java

@@ -1,17 +1,92 @@
 package net.codersky.skyutils.spigot.player;
 
+import net.codersky.skyutils.crossplatform.player.SkyPlayer;
+import net.kyori.adventure.sound.Sound;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-public class SpigotPlayer extends OfflineSpigotPlayer implements ISpigotPlayer {
+public interface SpigotPlayer extends OfflineSpigotPlayer, SkyPlayer {
 
-	protected SpigotPlayer(@NotNull Player handle) {
-		super(handle);
+	/*
+	 - OfflineSpigotPlayerImpl Override
+	 */
+
+	@NotNull
+	@Override
+	Player getHandle();
+
+	@NotNull
+	default Player getOnlineHandle() {
+		return getHandle();
 	}
 
 	@NotNull
 	@Override
-	public Player getHandle() {
-		return (Player) super.getHandle();
+	default String getName() {
+		return getHandle().getName();
+	}
+
+	/*
+	 - BaseComponent array conversion (Message utility)
+	 */
+
+	default BaseComponent[] toBase(@NotNull String legacyStr) {
+		return TextComponent.fromLegacyText(legacyStr);
+	}
+
+	default BaseComponent[] toBase(@NotNull Component component) {
+		return BungeeComponentSerializer.get().serialize(component);
+	}
+
+	/*
+	 - MessageReceiver implementation
+	 */
+
+	@Override
+	default boolean sendMessage(@NotNull String message) {
+		if (canReceive(message))
+			getHandle().sendMessage(message);
+		return true;
+	}
+
+	@Override
+	default boolean sendMessage(@NotNull Component message) {
+		if (canReceive(message))
+			getHandle().spigot().sendMessage(toBase(message));
+		return false;
+	}
+
+	/*
+	 - ActionBar
+	 */
+
+	@Override
+	default boolean sendActionBar(@NotNull String message) {
+		if (canReceive(message))
+			getHandle().spigot().sendMessage(ChatMessageType.ACTION_BAR, toBase(message));
+		return true;
+	}
+
+	@Override
+	default boolean sendActionBar(@NotNull Component message) {
+		if (canReceive(message))
+			getHandle().spigot().sendMessage(ChatMessageType.ACTION_BAR, toBase(message));
+		return true;
+	}
+
+	/*
+	 - Sounds
+	 */
+
+	@Override
+	default boolean playSound(@NotNull Sound sound) {
+		final Player handle = getHandle();
+		handle.playSound(handle.getLocation(), sound.name().asString(), sound.volume(), sound.pitch());
+		return true;
 	}
 }

platforms/spigot/src/main/java/net/codersky/skyutils/spigot/player/SpigotPlayerImpl.java

@@ -0,0 +1,17 @@
+package net.codersky.skyutils.spigot.player;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class SpigotPlayerImpl extends OfflineSpigotPlayerImpl implements SpigotPlayer {
+
+	protected SpigotPlayerImpl(@NotNull Player handle) {
+		super(handle);
+	}
+
+	@NotNull
+	@Override
+	public Player getHandle() {
+		return (Player) super.getHandle();
+	}
+}