diff --git a/src/main/java/dev/plex/PlexBase.java b/src/main/java/dev/plex/PlexBase.java index 89550bc..5b83055 100644 --- a/src/main/java/dev/plex/PlexBase.java +++ b/src/main/java/dev/plex/PlexBase.java @@ -1,6 +1,6 @@ package dev.plex; -public class PlexBase +public interface PlexBase { - protected final static Plex plugin = Plex.get(); + Plex plugin = Plex.get(); } diff --git a/src/main/java/dev/plex/admin/AdminList.java b/src/main/java/dev/plex/admin/AdminList.java index b866449..473c5fa 100644 --- a/src/main/java/dev/plex/admin/AdminList.java +++ b/src/main/java/dev/plex/admin/AdminList.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; * @see Admin */ -public class AdminList extends PlexBase +public class AdminList implements PlexBase { /** * Key / Value storage, where the key is the unique ID of the admin diff --git a/src/main/java/dev/plex/handlers/CommandHandler.java b/src/main/java/dev/plex/handlers/CommandHandler.java index 5b8f755..b84199c 100644 --- a/src/main/java/dev/plex/handlers/CommandHandler.java +++ b/src/main/java/dev/plex/handlers/CommandHandler.java @@ -10,7 +10,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.Set; -public class CommandHandler extends PlexBase +public class CommandHandler implements PlexBase { public CommandHandler() { diff --git a/src/main/java/dev/plex/handlers/ListenerHandler.java b/src/main/java/dev/plex/handlers/ListenerHandler.java index a433a22..78bedc5 100644 --- a/src/main/java/dev/plex/handlers/ListenerHandler.java +++ b/src/main/java/dev/plex/handlers/ListenerHandler.java @@ -10,7 +10,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.Set; -public class ListenerHandler extends PlexBase +public class ListenerHandler implements PlexBase { public ListenerHandler() { diff --git a/src/main/java/dev/plex/listener/PlexListener.java b/src/main/java/dev/plex/listener/PlexListener.java index 4bb32b4..c15c867 100644 --- a/src/main/java/dev/plex/listener/PlexListener.java +++ b/src/main/java/dev/plex/listener/PlexListener.java @@ -3,7 +3,7 @@ package dev.plex.listener; import dev.plex.PlexBase; import org.bukkit.event.Listener; -public abstract class PlexListener extends PlexBase implements Listener +public abstract class PlexListener implements Listener, PlexBase { public PlexListener() { diff --git a/src/main/java/dev/plex/punishment/PunishmentManager.java b/src/main/java/dev/plex/punishment/PunishmentManager.java index fc33b28..e0a8aea 100644 --- a/src/main/java/dev/plex/punishment/PunishmentManager.java +++ b/src/main/java/dev/plex/punishment/PunishmentManager.java @@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitRunnable; -public class PunishmentManager extends PlexBase +public class PunishmentManager implements PlexBase { @Getter private final List indefiniteBans = Lists.newArrayList(); diff --git a/src/main/java/dev/plex/services/AbstractService.java b/src/main/java/dev/plex/services/AbstractService.java index 45b4af2..7db6632 100644 --- a/src/main/java/dev/plex/services/AbstractService.java +++ b/src/main/java/dev/plex/services/AbstractService.java @@ -5,7 +5,7 @@ import lombok.Getter; import lombok.Setter; @Getter -public abstract class AbstractService extends PlexBase implements IService +public abstract class AbstractService implements IService, PlexBase { private boolean asynchronous; private boolean repeating; diff --git a/src/main/java/dev/plex/storage/MongoConnection.java b/src/main/java/dev/plex/storage/MongoConnection.java index 9f21631..56801ad 100644 --- a/src/main/java/dev/plex/storage/MongoConnection.java +++ b/src/main/java/dev/plex/storage/MongoConnection.java @@ -9,7 +9,7 @@ import dev.plex.PlexBase; import dev.plex.player.PlexPlayer; import dev.plex.util.PlexLog; -public class MongoConnection extends PlexBase +public class MongoConnection implements PlexBase { // USE MORPHIA API FOR MONGO <3 diff --git a/src/main/java/dev/plex/storage/RedisConnection.java b/src/main/java/dev/plex/storage/RedisConnection.java index 2433d93..c03152c 100644 --- a/src/main/java/dev/plex/storage/RedisConnection.java +++ b/src/main/java/dev/plex/storage/RedisConnection.java @@ -5,7 +5,7 @@ import dev.plex.util.PlexLog; import java.util.function.Consumer; import redis.clients.jedis.Jedis; -public class RedisConnection extends PlexBase +public class RedisConnection implements PlexBase { private Jedis jedis; diff --git a/src/main/java/dev/plex/storage/SQLConnection.java b/src/main/java/dev/plex/storage/SQLConnection.java index 350a585..8745a59 100644 --- a/src/main/java/dev/plex/storage/SQLConnection.java +++ b/src/main/java/dev/plex/storage/SQLConnection.java @@ -10,7 +10,7 @@ import java.sql.SQLException; import lombok.Getter; @Getter -public class SQLConnection extends PlexBase +public class SQLConnection implements PlexBase { private HikariDataSource dataSource; diff --git a/src/main/java/dev/plex/util/PlexUtils.java b/src/main/java/dev/plex/util/PlexUtils.java index 8cf0959..2611af9 100644 --- a/src/main/java/dev/plex/util/PlexUtils.java +++ b/src/main/java/dev/plex/util/PlexUtils.java @@ -60,7 +60,7 @@ import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -public class PlexUtils extends PlexBase +public class PlexUtils implements PlexBase { private static final Random RANDOM; private static final List regxList = new ArrayList<>() @@ -446,7 +446,9 @@ public class PlexUtils extends PlexBase public static void broadcastToAdmins(Component component) { Bukkit.getOnlinePlayers().stream().filter(pl -> PlayerCache.getPlexPlayer(pl.getUniqueId()).isAdminActive()).forEach(pl -> - Bukkit.broadcast(component)); + { + pl.sendMessage(component); + }); } public static Object simpleGET(String url) diff --git a/src/main/java/dev/plex/util/UpdateChecker.java b/src/main/java/dev/plex/util/UpdateChecker.java index 124969b..47a60ff 100644 --- a/src/main/java/dev/plex/util/UpdateChecker.java +++ b/src/main/java/dev/plex/util/UpdateChecker.java @@ -27,7 +27,7 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.json.JSONObject; -public class UpdateChecker extends PlexBase +public class UpdateChecker implements PlexBase { /* * -4 = Never checked for updates