Changelog:

* Code Improvements

Author: TheProgramSrc

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>xyz.theprogramsrc</groupId>
     <artifactId>SuperCoreAPI</artifactId>
-    <version>4.1.4</version>
+    <version>4.2.0-BETA0</version>
     <packaging>jar</packaging>
 
     <name>SuperCoreAPI</name>

src/main/java/xyz/theprogramsrc/supercoreapi/SuperPlugin.java

@@ -166,7 +166,7 @@ default void registerLogFilter(LogsFilter logsFilter){
 
     /**
      * Gets the plugin data storage
-     * @return
+     * @return the plugin data storage
      */
     PluginDataStorage getPluginDataStorage();
 }

src/main/java/xyz/theprogramsrc/supercoreapi/bungee/BungeeModule.java

@@ -10,44 +10,44 @@ public class BungeeModule extends SuperModule<Listener> implements Listener {
 
     protected BungeePlugin bungeePlugin;
 
-    public BungeeModule(BungeePlugin plugin, boolean registerListener){
-        super(plugin);
-        this.bungeePlugin = plugin;
+    public BungeeModule(boolean registerListener){
+        super(BungeePlugin.i);
+        this.bungeePlugin = BungeePlugin.i;
         if(registerListener) this.listener(this);
         this.onLoad();
     }
 
-    public BungeeModule(BungeePlugin plugin){
-        this(plugin, true);
+    public BungeeModule(){
+        this(true);
     }
 
     @Override
     protected void listener(Listener... listeners) {
-        ((BungeePlugin)this.plugin).listener(listeners);
+        this.bungeePlugin.listener(listeners);
     }
 
     /**
      * Gets the BungeeCord Plugin Settings
      * @return The Plugin Settings
      */
     protected Settings getSettings(){
-        return ((BungeePlugin)this.plugin).getSettings();
+        return this.bungeePlugin.getSettings();
     }
 
     /**
      * Gets the proxy
      * @return The proxy
      */
     protected ProxyServer getProxy(){
-        return ((BungeePlugin)this.plugin).getProxy();
+        return this.bungeePlugin.getProxy();
     }
 
     /**
      * Gets the BungeeTasks util
      * @return the BungeeTasks util
      */
     protected BungeeTasks getBungeeTasks(){
-        return ((BungeePlugin)this.plugin).getBungeeTasks();
+        return this.bungeePlugin.getBungeeTasks();
     }
 
 }

src/main/java/xyz/theprogramsrc/supercoreapi/bungee/BungeePlugin.java

@@ -59,12 +59,12 @@ public void onLoad() {
     public void onEnable() {
         if(this.emergencyStop) return;
         this.log("Enabling plugin &3v" + this.getPluginVersion());
-        this.bungeeTasks = new BungeeTasks(this);
-        this.settings = new Settings(this);
+        this.bungeeTasks = new BungeeTasks();
+        this.settings = new Settings();
         this.translationsFolder = Utils.folder(new File(this.getDataFolder(), "translations/"));
         this.translationManager = new TranslationManager(this);
         this.getTranslationManager().registerTranslation(Base.class);
-        new BungeeEventManager(this);
+        new BungeeEventManager();
         PluginClassLoader classLoader = new ReflectionClassLoader(this);
         this.dependencyManager = new DependencyManager(this, classLoader);
         this.dependencyManager.loadDependencies(Dependencies.get());

src/main/java/xyz/theprogramsrc/supercoreapi/bungee/commands/BungeeCommand.java

@@ -5,7 +5,6 @@
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 import xyz.theprogramsrc.supercoreapi.bungee.BungeeModule;
-import xyz.theprogramsrc.supercoreapi.bungee.BungeePlugin;
 import xyz.theprogramsrc.supercoreapi.bungee.utils.BungeeConsole;
 import xyz.theprogramsrc.supercoreapi.global.translations.Base;
 
@@ -17,20 +16,17 @@ public abstract class BungeeCommand extends BungeeModule {
 
     /**
      * Create a new {@link BungeeCommand BungeeCommand}
-     *
-     * @param plugin The {@link BungeePlugin BungeeCord Plugin}
      */
-    public BungeeCommand(final BungeePlugin plugin){
-        super(plugin);
-        getProxy().getPluginManager().registerCommand(plugin, new Command(this.getCommand(), this.getPermission(), this.getAliases()) {
+    public BungeeCommand(){
+        getProxy().getPluginManager().registerCommand(this.bungeePlugin, new Command(this.getCommand(), this.getPermission(), this.getAliases()) {
             @Override
             public void execute(CommandSender sender, String[] args) {
                 CommandResult result;
                 if(sender instanceof ProxiedPlayer){
                     ProxiedPlayer player = ((ProxiedPlayer)sender);
                     result = BungeeCommand.this.onPlayerExecute(player, args);
                 }else{
-                    result = BungeeCommand.this.onConsoleExecute(new BungeeConsole(plugin), args);
+                    result = BungeeCommand.this.onConsoleExecute(new BungeeConsole(), args);
                 }
                 BungeeCommand.this.onResult(sender, result);
             }
@@ -39,17 +35,17 @@ public void execute(CommandSender sender, String[] args) {
 
     private void onResult(CommandSender sender, CommandResult result){
         if(result == CommandResult.NO_PERMISSION){
-            sender.sendMessage(new TextComponent(this.plugin.getSuperUtils().color(Base.NO_PERMISSION.toString())));
+            sender.sendMessage(new TextComponent(this.bungeePlugin.getSuperUtils().color(Base.NO_PERMISSION.toString())));
         }else if(result == CommandResult.NO_ACCESS){
-            sender.sendMessage(new TextComponent(this.plugin.getSuperUtils().color(Base.NO_ACCESS.toString())));
+            sender.sendMessage(new TextComponent(this.bungeePlugin.getSuperUtils().color(Base.NO_ACCESS.toString())));
         }else if(result == CommandResult.NOT_SUPPORTED){
             if(sender instanceof ProxiedPlayer){
-                sender.sendMessage(new TextComponent(this.plugin.getSuperUtils().color(Base.NOT_SUPPORTED.options().vars(Base.CONSOLE.toString()).toString())));
+                sender.sendMessage(new TextComponent(this.bungeePlugin.getSuperUtils().color(Base.NOT_SUPPORTED.options().vars(Base.CONSOLE.toString()).toString())));
             }else{
-                sender.sendMessage(new TextComponent(this.plugin.getSuperUtils().color(Base.NOT_SUPPORTED.options().vars(Base.PLAYERS.toString()).toString())));
+                sender.sendMessage(new TextComponent(this.bungeePlugin.getSuperUtils().color(Base.NOT_SUPPORTED.options().vars(Base.PLAYERS.toString()).toString())));
             }
         }else if(result == CommandResult.INVALID_ARGS){
-            sender.sendMessage(new TextComponent(this.plugin.getSuperUtils().color(Base.INVALID_ARGUMENTS.toString())));
+            sender.sendMessage(new TextComponent(this.bungeePlugin.getSuperUtils().color(Base.INVALID_ARGUMENTS.toString())));
         }
     }
 

src/main/java/xyz/theprogramsrc/supercoreapi/bungee/events/BungeeEventManager.java

@@ -1,15 +1,10 @@
 package xyz.theprogramsrc.supercoreapi.bungee.events;
 
 import xyz.theprogramsrc.supercoreapi.bungee.BungeeModule;
-import xyz.theprogramsrc.supercoreapi.bungee.BungeePlugin;
 
 /**
  * This manages the customized events
  */
 public class BungeeEventManager extends BungeeModule {
 
-    public BungeeEventManager(BungeePlugin plugin) {
-        super(plugin);
-    }
-
 }

src/main/java/xyz/theprogramsrc/supercoreapi/bungee/storage/Settings.java

@@ -1,7 +1,6 @@
 package xyz.theprogramsrc.supercoreapi.bungee.storage;
 
 import xyz.theprogramsrc.supercoreapi.bungee.BungeeModule;
-import xyz.theprogramsrc.supercoreapi.bungee.BungeePlugin;
 import xyz.theprogramsrc.supercoreapi.bungee.utils.storage.BungeeYMLConfig;
 
 /**
@@ -13,10 +12,6 @@ public class Settings extends BungeeModule {
 
     private String defaultPrefix;
 
-    public Settings(BungeePlugin plugin) {
-        super(plugin);
-    }
-
     @Override
     public void onLoad() {
         this.config = new BungeeYMLConfig(this.getPluginFolder(), "Settings.yml");

src/main/java/xyz/theprogramsrc/supercoreapi/bungee/utils/BungeeConsole.java

@@ -3,23 +3,18 @@
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.Listener;
 import xyz.theprogramsrc.supercoreapi.bungee.BungeeModule;
-import xyz.theprogramsrc.supercoreapi.bungee.BungeePlugin;
 
 /**
  * Representation of a BungeeCord Console
  */
 public class BungeeConsole extends BungeeModule {
 
-    public BungeeConsole(BungeePlugin plugin) {
-        super(plugin);
-    }
-
     /**
      * Registers the specified listeners
      * @param listeners The listeners to register
      */
     public void listeners(Listener... listeners){
-        ((BungeePlugin)this.plugin).listener(listeners);
+        this.bungeePlugin.listener(listeners);
     }
 
     /**

src/main/java/xyz/theprogramsrc/supercoreapi/bungee/utils/tasks/BungeeTasks.java

@@ -3,7 +3,6 @@
 import net.md_5.bungee.api.scheduler.ScheduledTask;
 import net.md_5.bungee.api.scheduler.TaskScheduler;
 import xyz.theprogramsrc.supercoreapi.bungee.BungeeModule;
-import xyz.theprogramsrc.supercoreapi.bungee.BungeePlugin;
 import xyz.theprogramsrc.supercoreapi.global.objects.RecurringTask;
 
 import java.util.concurrent.TimeUnit;
@@ -12,9 +11,8 @@ public class BungeeTasks extends BungeeModule {
 
     private final TaskScheduler scheduler;
 
-    public BungeeTasks(BungeePlugin plugin) {
-        super(plugin);
-        this.scheduler = plugin.getProxy().getScheduler();
+    public BungeeTasks() {
+        this.scheduler = this.getProxy().getScheduler();
     }
 
     /**
@@ -25,7 +23,7 @@ public BungeeTasks(BungeePlugin plugin) {
      * @return the scheduled task
      */
     public ScheduledTask runAsync(Runnable task){
-        return this.scheduler.runAsync(((BungeePlugin)this.plugin), task);
+        return this.scheduler.runAsync(this.bungeePlugin, task);
     }
 
     /**
@@ -37,7 +35,7 @@ public ScheduledTask runAsync(Runnable task){
      * @return the scheduled task
      */
     public ScheduledTask runAsyncLater(Runnable task, long delay){
-        return this.scheduler.schedule(((BungeePlugin)this.plugin), task, delay*50L, TimeUnit.MILLISECONDS);
+        return this.scheduler.schedule(this.bungeePlugin, task, delay*50L, TimeUnit.MILLISECONDS);
     }
 
     /**
@@ -52,7 +50,7 @@ public ScheduledTask runAsyncLater(Runnable task, long delay){
      * @return the scheduled task
      */
     public RecurringTask runAsyncTimer(Runnable task, long delay, long period){
-        ScheduledTask scheduledTask = this.scheduler.schedule(((BungeePlugin)this.plugin), task, delay*50L, period*50L, TimeUnit.MILLISECONDS);
+        ScheduledTask scheduledTask = this.scheduler.schedule(this.bungeePlugin, task, delay*50L, period*50L, TimeUnit.MILLISECONDS);
         return new RecurringTask() {
             private boolean cancelled;
             @Override

src/main/java/xyz/theprogramsrc/supercoreapi/global/utils/ServerUtils.java

@@ -1,76 +1,17 @@
 package xyz.theprogramsrc.supercoreapi.global.utils;
 
-import xyz.theprogramsrc.supercoreapi.SuperPlugin;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
+import xyz.theprogramsrc.supercoreapi.global.utils.serverutils.BungeeServerUtils;
+import xyz.theprogramsrc.supercoreapi.global.utils.serverutils.SpigotServerUtils;
 
 public class ServerUtils {
-
-    protected SuperPlugin<?> plugin;
-
-    public ServerUtils(SuperPlugin<?> plugin){
-        this.plugin = plugin;
-    }
-
-    /**
-     * Send a player to another server
-     * @param player the player
-     * @param server the server
-     */
-    public void sendToServer(Object player, String server){
-        boolean canBungee = false;
-        try{
-            Class.forName("net.md_5.bungee.api.connection.ProxiedPlayer");
-            canBungee = true;
-        }catch (ClassNotFoundException ignored){ }
-
-        if(canBungee){
-            if(player instanceof net.md_5.bungee.api.connection.ProxiedPlayer){
-                this.sendToServerBungee(((net.md_5.bungee.api.connection.ProxiedPlayer)player), server);
-            }else{
-                this.sendToServerBukkit(((org.bukkit.entity.Player)player), server);
-            }
-        }else{
-            if(player instanceof org.bukkit.entity.Player){
-                this.sendToServerBukkit(((org.bukkit.entity.Player)player), server);
-            }else{
-                throw new IllegalArgumentException("The argument 'player' must be org.bukkit.entity.Player or net.md_5.bungee.api.connection.ProxiedPlayer");
-            }
-        }
+    
+    public SpigotServerUtils spigot(){
+        return new SpigotServerUtils();
     }
 
-    private void sendToServerBukkit(org.bukkit.entity.Player player, String server){
-        if(!((org.bukkit.plugin.java.JavaPlugin)this.plugin.getPlugin()).getServer().getMessenger().isOutgoingChannelRegistered(((org.bukkit.plugin.java.JavaPlugin)this.plugin.getPlugin()), "BungeeCord")){
-            ((org.bukkit.plugin.java.JavaPlugin)this.plugin.getPlugin()).getServer().getMessenger().registerOutgoingPluginChannel(((org.bukkit.plugin.java.JavaPlugin)this.plugin.getPlugin()), "BungeeCord");
-        }
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
-
-        try{
-            dataOutputStream.writeUTF("Connect");
-            dataOutputStream.writeUTF(server);
-        }catch (Exception ex){
-            ex.printStackTrace();
-        }
-
-        player.sendPluginMessage(((org.bukkit.plugin.java.JavaPlugin)this.plugin.getPlugin()), "BungeeCord", byteArrayOutputStream.toByteArray());
-    }
-
-    private void sendToServerBungee(net.md_5.bungee.api.connection.ProxiedPlayer player, String server){
-        ((net.md_5.bungee.api.plugin.Plugin)this.plugin).getProxy().registerChannel("BungeeCord");
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
-
-        try{
-            dataOutputStream.writeUTF("Connect");
-            dataOutputStream.writeUTF(server);
-        }catch (Exception ex){
-            ex.printStackTrace();
-        }
-        player.sendData("BungeeCord", byteArrayOutputStream.toByteArray());
+    public BungeeServerUtils bungee(){
+        return new BungeeServerUtils();
     }
 
-
 }