diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ce2f574..d61c9586 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,6 @@ on: push: branches: [ "master" ] pull_request: - branches: [ "master" ] jobs: build: diff --git a/src/main/java/xyz/earthcow/networkjoinmessages/bungee/BungeeMain.java b/src/main/java/xyz/earthcow/networkjoinmessages/bungee/BungeeMain.java index 2398af88..00bb550b 100644 --- a/src/main/java/xyz/earthcow/networkjoinmessages/bungee/BungeeMain.java +++ b/src/main/java/xyz/earthcow/networkjoinmessages/bungee/BungeeMain.java @@ -124,16 +124,6 @@ public CoreCommandSender getConsole() { return console; } - @Override - public Core getCore() { - return core; - } - - @Override - public ServerType getServerType() { - return ServerType.BUNGEE; - } - @Override public CoreLogger getCoreLogger() { return bungeeLogger; diff --git a/src/main/java/xyz/earthcow/networkjoinmessages/common/abstraction/CorePlugin.java b/src/main/java/xyz/earthcow/networkjoinmessages/common/abstraction/CorePlugin.java index cafe8632..da02d5df 100644 --- a/src/main/java/xyz/earthcow/networkjoinmessages/common/abstraction/CorePlugin.java +++ b/src/main/java/xyz/earthcow/networkjoinmessages/common/abstraction/CorePlugin.java @@ -1,6 +1,5 @@ package xyz.earthcow.networkjoinmessages.common.abstraction; -import xyz.earthcow.networkjoinmessages.common.Core; import xyz.earthcow.networkjoinmessages.common.modules.DiscordIntegration; import java.io.File; @@ -8,11 +7,8 @@ import java.util.UUID; public interface CorePlugin { - Core getCore(); - void disable(); - ServerType getServerType(); File getDataFolder(); CoreLogger getCoreLogger(); diff --git a/src/main/java/xyz/earthcow/networkjoinmessages/common/abstraction/ServerType.java b/src/main/java/xyz/earthcow/networkjoinmessages/common/abstraction/ServerType.java deleted file mode 100644 index 686a96b1..00000000 --- a/src/main/java/xyz/earthcow/networkjoinmessages/common/abstraction/ServerType.java +++ /dev/null @@ -1,21 +0,0 @@ -package xyz.earthcow.networkjoinmessages.common.abstraction; - -public enum ServerType { - BUNGEE ("BungeeCord"), - VELOCITY("Velocity"); - - private final String displayName; - - ServerType() { - this(null); - } - - ServerType(String displayName) { - this.displayName = displayName; - } - - @Override - public String toString() { - return (displayName != null) ? displayName : super.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/xyz/earthcow/networkjoinmessages/velocity/VelocityMain.java b/src/main/java/xyz/earthcow/networkjoinmessages/velocity/VelocityMain.java index 3ea6adb4..68aa682a 100644 --- a/src/main/java/xyz/earthcow/networkjoinmessages/velocity/VelocityMain.java +++ b/src/main/java/xyz/earthcow/networkjoinmessages/velocity/VelocityMain.java @@ -261,16 +261,6 @@ public PremiumVanish getVanishAPI() { return premiumVanish; } - @Override - public ServerType getServerType() { - return ServerType.VELOCITY; - } - - @Override - public Core getCore() { - return core; - } - @Override public CoreCommandSender getConsole() { return console;