1.1.8

The option Bungee was removed from the config.yml and from now on the option from the T2CodeLib will be used.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>Alias</artifactId>
-    <version>1.1.5</version>
+    <version>1.1.8</version>
     <packaging>jar</packaging>
 
     <name>T2C-Alias</name>
@@ -19,6 +19,7 @@
     <url>T2Code.net</url>
 
     <build>
+        <finalName>${project.artifactId}_${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -69,22 +70,26 @@
         <dependency>
             <groupId>net.t2code</groupId>
             <artifactId>T2CodeLib</artifactId>
-            <version>13.4</version>
+            <version>14.2</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.t2code</groupId>
             <artifactId>bungee</artifactId>
             <version>1615</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.t2code</groupId>
             <artifactId>PlugmanGUI</artifactId>
             <version>3.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>net.t2code.minecraft.1_19.r1</groupId>
+            <groupId>net.t2code.minecraft.1_13.r1</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.19r1</version>
+            <version>1.13r1</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

src/main/java/net/t2code/alias/Spigot/Main.java

@@ -2,6 +2,8 @@ package net.t2code.alias.Spigot;
 
 import net.t2code.alias.Spigot.objects.AliasObject;
 import net.t2code.alias.Spigot.objects.SubAliasObject;
+import net.t2code.alias.Spigot.system.BukkitCommandWrap;
+import net.t2code.alias.Spigot.system.BukkitCommandWrap_Useless;
 import net.t2code.alias.Spigot.system.Load;
 import net.t2code.alias.Util;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate;
@@ -23,6 +25,7 @@ public final class Main extends JavaPlugin {
     private static List<String> autor;
     private static Main plugin;
     public static HashMap<String, AliasObject> aliasHashMap = new HashMap<>();
+    public static HashMap<String, Boolean> loadAliasHashMap = new HashMap<>();
     public static HashMap<String, SubAliasObject> subAliasHashMap = new HashMap<>();
     public static ArrayList<String> allAliases = new ArrayList<>();
     public static ArrayList<String> allSubAliases = new ArrayList<>();
@@ -35,6 +38,12 @@ public final class Main extends JavaPlugin {
         autor = plugin.getDescription().getAuthors();
         version = plugin.getDescription().getVersion();
         if (pluginNotFound("T2CodeLib", 96388, Util.getRequiredT2CodeLibVersion())) return;
+        try {
+            Class.forName("com.mojang.brigadier.CommandDispatcher");
+            this.bukkitCommandWrap = new BukkitCommandWrap();
+        } catch (ClassNotFoundException | NoClassDefFoundError e) {
+            this.bukkitCommandWrap = new BukkitCommandWrap_Useless();
+        }
         Load.onLoad(Util.getPrefix(), autor, version, Util.getSpigot(), Util.getDiscord(), Util.getBstatsID());
     }
 
@@ -91,4 +100,10 @@ public final class Main extends JavaPlugin {
     public static List<String> getAutor() {
         return autor;
     }
+
+    private BukkitCommandWrap bukkitCommandWrap = null;
+
+    public BukkitCommandWrap getBukkitCommandWrap() {
+        return this.bukkitCommandWrap;
+    }
 }

src/main/java/net/t2code/alias/Spigot/cmdManagement/Commands.java

@@ -2,6 +2,7 @@ package net.t2code.alias.Spigot.cmdManagement;
 
 import net.t2code.alias.Spigot.Main;
 import net.t2code.alias.Spigot.config.languages.SelectMessages;
+import net.t2code.alias.Spigot.system.Load;
 import net.t2code.alias.Util;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate;
@@ -10,16 +11,16 @@ import org.bukkit.entity.Player;
 
 public class Commands {
     public static void info(CommandSender sender) {
-        T2Ctemplate.sendInfo(sender,Main.getPlugin(),Util.getSpigotID(),Util.getDiscord(),Util.getInfoText());
+        T2Ctemplate.sendInfo(sender, Main.getPlugin(), Util.getSpigotID(), Util.getDiscord(), Util.getInfoText());
     }
 
     public static void reload(CommandSender sender) {
-        if (sender instanceof Player) sender.sendMessage(SelectMessages.reloadStart);
+        if (sender instanceof Player) T2Csend.player((Player) sender, SelectMessages.reloadStart);
         T2Csend.console(Util.getPrefix() + "§8-------------------------------");
         T2Csend.console(Util.getPrefix() + " §6Plugin reload...");
         T2Csend.console(Util.getPrefix() + "§8-------------------------------");
-        Main.getPlugin().onEnable();
-        if (sender instanceof Player) sender.sendMessage(SelectMessages.reloadEnd);
+        Load.loadReload();
+        if (sender instanceof Player) T2Csend.player((Player) sender, SelectMessages.reloadEnd);
         T2Csend.console(Util.getPrefix() + "§8-------------------------------");
         T2Csend.console(Util.getPrefix() + " §2Plugin successfully reloaded.");
         T2Csend.console(Util.getPrefix() + "§8-------------------------------");

src/main/java/net/t2code/alias/Spigot/cmdManagement/ExecuteAlias.java

@@ -11,6 +11,8 @@ import net.t2code.t2codelib.SPIGOT.api.eco.T2Ceco;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import net.t2code.t2codelib.SPIGOT.api.plugins.T2CpluginCheck;
+import net.t2code.t2codelib.SPIGOT.api.yaml.T2CLibConfig;
+import net.t2code.t2codelib.SPIGOT.api.yaml.T2Cconfig;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -27,7 +29,7 @@ public class ExecuteAlias {
         if (aliasObject.adminEnable) {
             if (player.hasPermission(aliasObject.adminPermission)) {
                 if (aliasObject.adminCommandEnable) {
-                    aliasAdminCommand(aliasObject, player, args);
+                    aliasAdminCommand(aliasObject, alias, player, args);
                 }
                 if (aliasObject.adminMessageEnable) {
                     aliasAdminMessage(aliasObject, alias, player, args);
@@ -57,7 +59,7 @@ public class ExecuteAlias {
             }
         }
         if (aliasObject.commandEnable) {
-            aliasCommand(aliasObject, player, args);
+            aliasCommand(aliasObject, alias, player, args);
         }
         if (aliasObject.messageEnable) {
             aliasMessage(aliasObject, alias, player, args);
@@ -76,7 +78,7 @@ public class ExecuteAlias {
             if (aliasObject.adminEnable) {
                 if (player.hasPermission(aliasObject.adminPermission)) {
                     if (aliasObject.adminCommandEnable) {
-                        subAliasAdminCommand(aliasObject, player, args);
+                        subAliasAdminCommand(aliasObject,alias, player, args);
                     }
                     if (aliasObject.adminMessageEnable) {
                         subAliasAdminMessage(aliasObject, alias, player, args);
@@ -113,7 +115,7 @@ public class ExecuteAlias {
             }
         } else {
             if (aliasObject.consoleEnable) {
-                subAliasConsole(aliasObject, sender, args);
+                subAliasConsole(aliasObject,alias, sender, args);
             } else T2Csend.sender(sender, SelectMessages.onlyForPlayer);
         }
     }
@@ -122,7 +124,7 @@ public class ExecuteAlias {
         if (alias.consoleCommandEnable) {
             for (String cmd : alias.consoleCommands) {
                 if (alias.consoleBungeeCommand) {
-                    if (SelectConfig.getBungee()) {
+                    if (T2CLibConfig.getBungee()) {
                         BCommandSenderReciver.sendToBungee(sender, cmd, true);
                     } else {
                         T2Csend.console(Util.getPrefix() + " §4To use bungee commands, enable the Bungee option in the config.");
@@ -140,7 +142,7 @@ public class ExecuteAlias {
         }
     }
 
-    private static void subAliasConsole(SubAliasObject alias, CommandSender sender, String[] args) {
+    private static void subAliasConsole(SubAliasObject aliasObject, String alias, CommandSender sender, String[] args) {
         String targetSt = "[target]";
         try {
             List<String> results = Arrays.stream(args).filter(a -> a.contains("-p:")).collect(Collectors.toList());
@@ -148,28 +150,29 @@ public class ExecuteAlias {
         } catch (Exception ignored) {
 
         }
-        if (alias.consoleCommandEnable) {
-            for (String cmd : alias.consoleCommands) {
-                if (alias.consoleBungeeCommand) {
-                    if (SelectConfig.getBungee()) {
-                        BCommandSenderReciver.sendToBungee(sender, cmd.replace("[target]", targetSt), true);
+        if (aliasObject.consoleCommandEnable) {
+            for (String cmd : aliasObject.consoleCommands) {
+                String replace = cmd.replace("[target]", targetSt).replace("[alias]", alias);
+                if (aliasObject.consoleBungeeCommand) {
+                    if (T2CLibConfig.getBungee()) {
+                        BCommandSenderReciver.sendToBungee(sender, replace, true);
                     } else {
                         T2Csend.console(Util.getPrefix() + " §4To use bungee commands, enable the Bungee option in the config.");
                         T2Csend.sender(sender, Util.getPrefix() + " §4To use bungee commands, enable the Bungee option in the config.");
                     }
                 } else {
-                    T2Ccmd.console(cmd.replace("[target]", targetSt));
+                    T2Ccmd.console(replace);
                 }
             }
         }
-        if (alias.consoleMessageEnable) {
-            for (String msg : alias.consoleMessages) {
+        if (aliasObject.consoleMessageEnable) {
+            for (String msg : aliasObject.consoleMessages) {
                 T2Csend.console(T2Creplace.replace(prefix, msg));
             }
         }
     }
 
-    private static void aliasAdminCommand(AliasObject alias, Player player, String[] args) {
+    private static void aliasAdminCommand(AliasObject aliasObject, String alias, Player player, String[] args) {
         String targetSt = "[target]";
         try {
             List<String> results = Arrays.stream(args).filter(a -> a.contains("-p:")).collect(Collectors.toList());
@@ -177,26 +180,26 @@ public class ExecuteAlias {
         } catch (Exception ignored) {
 
         }
-        for (String cmd : alias.adminCommands) {
-            if (alias.adminBungeeCommand) {
-                if (SelectConfig.getBungee()) {
-                    BCommandSenderReciver.sendToBungee(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt), alias.adminCommandAsConsole);
+        for (String cmd : aliasObject.adminCommands) {
+            if (aliasObject.adminBungeeCommand) {
+                if (T2CLibConfig.getBungee()) {
+                    BCommandSenderReciver.sendToBungee(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt).replace("[alias]", alias), aliasObject.adminCommandAsConsole);
 
                 } else {
                     T2Csend.console(Util.getPrefix() + " §4To use bungee commands, enable the Bungee option in the config.");
                     T2Csend.player(player, Util.getPrefix() + " §4To use bungee commands, enable the Bungee option in the config.");
                 }
             } else {
-                if (alias.adminCommandAsConsole) {
-                    T2Ccmd.console(cmd.replace("[player]", player.getName()).replace("[target]", targetSt));
+                if (aliasObject.adminCommandAsConsole) {
+                    T2Ccmd.console(cmd.replace("[player]", player.getName()).replace("[target]", targetSt).replace("[alias]", alias));
                 } else {
-                    T2Ccmd.player(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt));
+                    T2Ccmd.player(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt).replace("[alias]", alias));
                 }
             }
         }
     }
 
-    private static void subAliasAdminCommand(SubAliasObject alias, Player player, String[] args) {
+    private static void subAliasAdminCommand(SubAliasObject aliasObject, String alias, Player player, String[] args) {
         String targetSt = "[target]";
         try {
             List<String> results = Arrays.stream(args).filter(a -> a.contains("-p:")).collect(Collectors.toList());
@@ -204,20 +207,20 @@ public class ExecuteAlias {
         } catch (Exception ignored) {
 
         }
-        for (String cmd : alias.adminCommands) {
-            if (alias.adminBungeeCommand) {
-                if (SelectConfig.getBungee()) {
-                    BCommandSenderReciver.sendToBungee(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt), alias.adminCommandAsConsole);
+        for (String cmd : aliasObject.adminCommands) {
+            if (aliasObject.adminBungeeCommand) {
+                if (T2CLibConfig.getBungee()) {
+                    BCommandSenderReciver.sendToBungee(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt).replace("[alias]", alias), aliasObject.adminCommandAsConsole);
 
                 } else {
                     T2Csend.console(Util.getPrefix() + " §4To use bungee commands, enable the Bungee option in the config.");
                     T2Csend.player(player, Util.getPrefix() + " §4To use bungee commands, enable the Bungee option in the config.");
                 }
             } else {
-                if (alias.adminCommandAsConsole) {
-                    T2Ccmd.console(cmd.replace("[player]", player.getName()).replace("[target]", targetSt));
+                if (aliasObject.adminCommandAsConsole) {
+                    T2Ccmd.console(cmd.replace("[player]", player.getName()).replace("[target]", targetSt).replace("[alias]", alias));
                 } else {
-                    T2Ccmd.player(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt));
+                    T2Ccmd.player(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt).replace("[alias]", alias));
                 }
             }
         }
@@ -261,7 +264,7 @@ public class ExecuteAlias {
         }
     }
 
-    private static void aliasCommand(AliasObject alias, Player player, String[] args) {
+    private static void aliasCommand(AliasObject aliasObject, String alias, Player player, String[] args) {
         String targetSt = "[target]";
         try {
             List<String> results = Arrays.stream(args).filter(a -> a.contains("-p:")).collect(Collectors.toList());
@@ -269,20 +272,19 @@ public class ExecuteAlias {
         } catch (Exception ignored) {
 
         }
-        for (String cmd : alias.command) {
-            if (alias.bungeeCommand) {
-                if (SelectConfig.getBungee()) {
-                    BCommandSenderReciver.sendToBungee(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt), alias.commandAsConsole);
-
+        for (String cmd : aliasObject.command) {
+            if (aliasObject.bungeeCommand) {
+                if (T2CLibConfig.getBungee()) {
+                    BCommandSenderReciver.sendToBungee(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt).replace("[alias]", alias), aliasObject.commandAsConsole);
                 } else {
                     T2Csend.console(Util.getPrefix() + " §4To use bungee commands, enable the Bungee option in the config.");
                     T2Csend.player(player, Util.getPrefix() + " §4To use bungee commands, enable the Bungee option in the config.");
                 }
             } else {
-                if (alias.commandAsConsole) {
-                    T2Ccmd.console(cmd.replace("[player]", player.getName()).replace("[target]", targetSt));
+                if (aliasObject.commandAsConsole) {
+                    T2Ccmd.console(cmd.replace("[player]", player.getName()).replace("[target]", targetSt).replace("[alias]", alias));
                 } else {
-                    T2Ccmd.player(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt));
+                    T2Ccmd.player(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt).replace("[alias]", alias));
                 }
             }
         }
@@ -298,7 +300,7 @@ public class ExecuteAlias {
         }
         for (String cmd : alias.command) {
             if (alias.bungeeCommand) {
-                if (SelectConfig.getBungee()) {
+                if (T2CLibConfig.getBungee()) {
                     BCommandSenderReciver.sendToBungee(player, cmd.replace("[player]", player.getName()).replace("[target]", targetSt), alias.commandAsConsole);
 
                 } else {

src/main/java/net/t2code/alias/Spigot/config/alias/CreateExampleAliasConfig.java

@@ -39,7 +39,7 @@ public class CreateExampleAliasConfig {
         T2Cconfig.set("Alias.Message.Enable", false, yamlConfiguration);
         T2Cconfig.set("Alias.Message.Messages", Arrays.asList(), yamlConfiguration);
 
-        T2Cconfig.set("Alias.Admin.Enable", true, yamlConfiguration);
+        T2Cconfig.set("Alias.Admin.Enable", false, yamlConfiguration);
         T2Cconfig.set("Alias.Admin.Permission", "t2code.alias.admin", yamlConfiguration);
 
         T2Cconfig.set("Alias.Admin.Command.Enable", true, yamlConfiguration);

src/main/java/net/t2code/alias/Spigot/config/alias/SelectAlias.java

@@ -4,11 +4,14 @@ import com.google.common.base.Preconditions;
 import net.t2code.alias.Spigot.Main;
 import net.t2code.alias.Spigot.system.AliasRegister;
 import net.t2code.alias.Spigot.objects.AliasObject;
+import net.t2code.alias.Spigot.system.BukkitCommandWrap_Useless;
 import net.t2code.alias.Util;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -23,6 +26,7 @@ public class SelectAlias {
 
         Main.aliasHashMap.clear();
         Main.allAliases.clear();
+
         File f = new File(Main.getPath() + "/Alias/");
         File[] fileArray = f.listFiles();
         for (File config_gui : fileArray) {
@@ -101,6 +105,7 @@ public class SelectAlias {
                 T2Csend.console(Prefix + " §aAlias file §e" + config_gui.getName() + " §awas loaded");
             }
         }
+        T2Ctemplate.onLoadSeparateStroke(Util.getPrefix());
         AliasRegister.onRegister();
     }
 

src/main/java/net/t2code/alias/Spigot/config/config/CreateConfig.java

@@ -21,16 +21,19 @@ public class CreateConfig {
         File config = new File(Main.getPath(), "config.yml");
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
 
-        T2Cconfig.set("Plugin.language", "english", yamlConfiguration);
-        T2Cconfig.set("Plugin.updateCheck.onJoin", true, yamlConfiguration);
-        T2Cconfig.set("Plugin.updateCheck.seePreReleaseUpdates", true, yamlConfiguration);
-        T2Cconfig.set("Plugin.updateCheck.timeInterval", 60, yamlConfiguration);
 
-        T2Cconfig.set("BungeeCord.Enable", false, yamlConfiguration);
-        T2Cconfig.set("BungeeCord.ThisServer", "server", yamlConfiguration);
+        if (yamlConfiguration.contains("ConfigVersion") && yamlConfiguration.getInt("ConfigVersion") < 4) {
+            convert();
+            return;
+        }
 
-        T2Cconfig.set("Buy.Message", true, yamlConfiguration);
-        T2Cconfig.set("SubAlias.TabComplete", true, yamlConfiguration);
+        T2Cconfig.set("plugin.language", "english", yamlConfiguration);
+        T2Cconfig.set("plugin.updateCheck.onJoin", true, yamlConfiguration);
+        T2Cconfig.set("plugin.updateCheck.seePreReleaseUpdates", true, yamlConfiguration);
+        T2Cconfig.set("plugin.updateCheck.timeInterval", 60, yamlConfiguration);
+
+        T2Cconfig.set("buy.message", true, yamlConfiguration);
+        T2Cconfig.set("subAlias.tabComplete", true, yamlConfiguration);
 
         try {
             yamlConfiguration.save(config);
@@ -39,4 +42,29 @@ public class CreateConfig {
         }
         T2Csend.console(Util.getPrefix() + " §2config.yml were successfully created / updated." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
     }
+
+    private static void convert() {
+        File configOld = new File(Main.getPath(), "config.yml");
+        configOld.renameTo(new File(Main.getPath(), "configV3.yml"));
+        YamlConfiguration yamlConfigurationOld = YamlConfiguration.loadConfiguration(configOld);
+
+        File config = new File(Main.getPath(), "config.yml");
+        YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
+
+        T2Cconfig.set("plugin.language", yamlConfigurationOld.getString("Plugin.language"), yamlConfiguration);
+        T2Cconfig.set("plugin.updateCheck.onJoin", yamlConfigurationOld.getBoolean("Plugin.updateCheck.onJoin"), yamlConfiguration);
+        T2Cconfig.set("plugin.updateCheck.seePreReleaseUpdates", yamlConfigurationOld.getBoolean("Plugin.updateCheck.seePreReleaseUpdates"), yamlConfiguration);
+        T2Cconfig.set("plugin.updateCheck.timeInterval", yamlConfigurationOld.getInt("Plugin.updateCheck.timeInterval"), yamlConfiguration);
+
+        T2Cconfig.set("buy.message", yamlConfigurationOld.getBoolean("Buy.Message"), yamlConfiguration);
+        T2Cconfig.set("subAlias.tabComplete", yamlConfigurationOld.getBoolean("SubAlias.TabComplete"), yamlConfiguration);
+
+        try {
+            yamlConfiguration.save(config);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        configCreate();
+    }
 }

src/main/java/net/t2code/alias/Spigot/config/config/SelectConfig.java

@@ -8,14 +8,12 @@ import java.io.File;
 import java.io.IOException;
 
 public class SelectConfig {
-    private static Integer ConfigVersion = 3;
+    private static Integer ConfigVersion = 4;
     private static Integer isConfigVersion;
     private static Boolean updateCheckOnJoin;
     private static Boolean updateCheckSeePreReleaseUpdates;
     private static Integer updateCheckTimeInterval;
     private static String language;
-    private static Boolean Bungee;
-    private static String thisServer;
 
     private static Boolean buyMessage;
     private static Boolean subAliasTab;
@@ -24,24 +22,21 @@ public class SelectConfig {
         File config = new File(Main.getPath(), "config.yml");
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
 
-        isConfigVersion = yamlConfiguration.getInt("ConfigVersion");
+        isConfigVersion = yamlConfiguration.getInt("configVersion");
 
-        updateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.updateCheck.onJoin");
-        updateCheckSeePreReleaseUpdates = yamlConfiguration.getBoolean("Plugin.updateCheck.seePreReleaseUpdates");
-        updateCheckTimeInterval = yamlConfiguration.getInt("Plugin.updateCheck.timeInterval");
+        updateCheckOnJoin = yamlConfiguration.getBoolean("plugin.updateCheck.onJoin");
+        updateCheckSeePreReleaseUpdates = yamlConfiguration.getBoolean("plugin.updateCheck.seePreReleaseUpdates");
+        updateCheckTimeInterval = yamlConfiguration.getInt("plugin.updateCheck.timeInterval");
 
+        language = yamlConfiguration.getString("plugin.language");
 
-        language = yamlConfiguration.getString("Plugin.language");
-        Bungee = yamlConfiguration.getBoolean("BungeeCord.Enable");
-        thisServer = yamlConfiguration.getString("BungeeCord.ThisServer");
-
-        buyMessage = yamlConfiguration.getBoolean("Buy.Message");
-        subAliasTab = yamlConfiguration.getBoolean("SubAlias.TabComplete");
+        buyMessage = yamlConfiguration.getBoolean("buy.message");
+        subAliasTab = yamlConfiguration.getBoolean("subAlias.tabComplete");
     }
     public static void setConfigVersion() {
         File config = new File(Main.getPath(), "config.yml");
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
-        yamlConfiguration.set("ConfigVersion", ConfigVersion);
+        yamlConfiguration.set("configVersion", ConfigVersion);
         try {
             yamlConfiguration.save(config);
         } catch (IOException e) {
@@ -73,14 +68,6 @@ public class SelectConfig {
         return language;
     }
 
-    public static Boolean getBungee() {
-        return Bungee;
-    }
-
-    public static String getThisServer() {
-        return thisServer;
-    }
-
     public static Boolean getBuyMessage() {
         return buyMessage;
     }

src/main/java/net/t2code/alias/Spigot/config/subAlias/CreateExampleSubAliasConfig.java

@@ -40,7 +40,7 @@ public class CreateExampleSubAliasConfig {
         T2Cconfig.set("SubAlias.Message.Enable", false, yamlConfiguration);
         T2Cconfig.set("SubAlias.Message.Messages",Arrays.asList(), yamlConfiguration);
 
-        T2Cconfig.set("SubAlias.Admin.Enable", true, yamlConfiguration);
+        T2Cconfig.set("SubAlias.Admin.Enable", false, yamlConfiguration);
         T2Cconfig.set("SubAlias.Admin.Permission", "t2code.alias.admin", yamlConfiguration);
 
         T2Cconfig.set("SubAlias.Admin.Command.Enable", true, yamlConfiguration);

src/main/java/net/t2code/alias/Spigot/system/AliasRegister.java

@@ -2,28 +2,89 @@ package net.t2code.alias.Spigot.system;
 
 import net.t2code.alias.Spigot.Main;
 import net.t2code.alias.Spigot.cmdManagement.RegisterCommands;
+import net.t2code.alias.Util;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
 import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
 import org.bukkit.command.CommandMap;
+import org.bukkit.command.SimpleCommandMap;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.SimplePluginManager;
 
 import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.Objects;
 
 public class AliasRegister {
     public static void onRegister() {
-        for (String alias : Main.allAliases) {
-            if (Main.aliasHashMap.get(alias) != null) {
-                if (alias.equals(" ")) continue;
-                if (Main.aliasHashMap.get(alias).aliasEnable) {
         try {
             final Field bukkitCommandMap = Bukkit.getServer().getClass().getDeclaredField("commandMap");
             bukkitCommandMap.setAccessible(true);
             CommandMap commandMap = (CommandMap) bukkitCommandMap.get(Bukkit.getServer());
-                        commandMap.register(alias, new RegisterCommands(alias));
+            // onUnRegister(bukkitCommandMap);
+            for (String alias : Main.allAliases) {
+                register(alias, commandMap);
+                // wrap(alias, commandMap);
+            }
+
+
+            if (!(T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12())) {
+                Main.getPlugin().getBukkitCommandWrap().sync();
+                if (Bukkit.getOnlinePlayers().size() >= 1)
+                    for (Player player : Bukkit.getOnlinePlayers()) player.updateCommands();
+            }
+
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
+
+    //public static void onUnRegister(Field bukkitCommandMap) throws IllegalAccessException {
+    //
+    //    //   if (Main.allAliases != null && !Main.allAliases.isEmpty()) {
+    //    //       if (!(Main.getPlugin().getBukkitCommandWrap() instanceof BukkitCommandWrap_Useless)) {
+    //    //           for (String alias : Main.allAliases) {
+    //    //               T2Csend.debugmsg(Main.getPlugin(),"uload: " + alias);
+    //    //               Main.getPlugin().
+    //    //                       Main.getPlugin().getBukkitCommandWrap().unwrap(alias);
+    //    //           }
+    //    //           Main.getPlugin().getBukkitCommandWrap().sync();
+    //    //           if (Bukkit.getOnlinePlayers().size() >= 1)
+    //    //               for (Player player : Bukkit.getOnlinePlayers()) player.updateCommands();
+    //    //       }
+    //    //   }
+    //   // commandMap.clearCommands();
+    //
+    //
+    //    for (Map.Entry<String, Boolean> entry : Main.loadAliasHashMap.entrySet()) {
+    //        ((SimpleCommandMap) bukkitCommandMap.get(simplePluginManager)).getCommand(entry.getKey()).unregister(bukkitCommandMap.get(Bukkit.getServer()));
+    //
+    //
+    //        if (entry.getValue())
+    //            Main.getPlugin().getBukkitCommandWrap().unwrap(entry.getKey());
+    //    }
+    //
+    //    Main.getPlugin().getBukkitCommandWrap().sync();
+    //    if (Bukkit.getOnlinePlayers().size() >= 1)
+    //        for (Player player : Bukkit.getOnlinePlayers()) player.updateCommands();
+    //    Main.loadAliasHashMap.clear();
+    //
+    //}
+
+    private static void register(String alias, CommandMap commandMap) {
+        if (Main.aliasHashMap.get(alias) != null) {
+            if (alias.equals(" ")) return;
+            if (Main.aliasHashMap.get(alias).aliasEnable) {
+                commandMap.register(alias, new RegisterCommands(alias));
+                T2Csend.console(Util.getPrefix() + " §aAlias §e" + alias + " §aregister");
+                Main.loadAliasHashMap.put(alias, true);
+            } else Main.loadAliasHashMap.put(alias, false);
         } else T2Csend.warning(Main.getPlugin(), " §4AliasHashmap is null! - " + alias);
     }
+
+    private static void wrap(String alias, CommandMap commandMap) {
+        Command cmd = commandMap.getCommand(alias);
+        Main.getPlugin().getBukkitCommandWrap().wrap(cmd, alias);
     }
 }

src/main/java/net/t2code/alias/Spigot/system/BukkitCommandWrap.java

@@ -0,0 +1,247 @@
+package net.t2code.alias.Spigot.system;
+
+import com.mojang.brigadier.tree.CommandNode;
+import com.mojang.brigadier.tree.RootCommandNode;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class BukkitCommandWrap {
+    private Field bField;
+    private Method removeCommandMethod;
+    private String nmsVersion;
+    private Class minecraftServerClass;
+    private Method aMethod;
+    private Method getServerMethod;
+    private Field vanillaCommandDispatcherField;
+    private Method getCommandDispatcherMethod;
+    private Method registerMethod;
+    private Method syncCommandsMethod;
+    private Constructor bukkitcommandWrapperConstructor;
+
+    public BukkitCommandWrap() {
+        try {
+            this.nmsVersion = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            e.printStackTrace();
+            this.nmsVersion = null;
+        }
+    }
+
+    public void wrap(Command command, String alias) {
+        if (this.nmsVersion == null) return;
+        if (this.minecraftServerClass == null) try {
+            this.minecraftServerClass = Class.forName("net.minecraft.server." + this.nmsVersion + ".MinecraftServer");
+        } catch (ClassNotFoundException e) {
+            try {
+                this.minecraftServerClass = Class.forName("net.minecraft.server.MinecraftServer");
+            } catch (ClassNotFoundException classNotFoundException) {
+                classNotFoundException.addSuppressed(e);
+                classNotFoundException.printStackTrace();
+                return;
+            }
+        }
+
+        if (this.getServerMethod == null) try {
+            this.getServerMethod = this.minecraftServerClass.getMethod("getServer");
+            this.getServerMethod.setAccessible(true);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        Object minecraftServer;
+        try {
+            minecraftServer = this.getServerMethod.invoke(this.minecraftServerClass);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        if (this.vanillaCommandDispatcherField == null) try {
+            this.vanillaCommandDispatcherField = this.minecraftServerClass.getDeclaredField("vanillaCommandDispatcher");
+            this.vanillaCommandDispatcherField.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        Object commandDispatcher = null;
+        try {
+            commandDispatcher = this.vanillaCommandDispatcherField.get(minecraftServer);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        if (this.bField == null) try {
+            this.bField = Class.forName("net.minecraft.commands.CommandDispatcher").getDeclaredField("g");
+            this.bField.setAccessible(true);
+        } catch (NoSuchFieldException | ClassNotFoundException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        com.mojang.brigadier.CommandDispatcher b;
+        try {
+            b = (com.mojang.brigadier.CommandDispatcher) this.bField.get(commandDispatcher);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        if (this.aMethod == null) try {
+            this.aMethod = commandDispatcher.getClass().getDeclaredMethod("a");
+            this.aMethod.setAccessible(true);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        if (this.bukkitcommandWrapperConstructor == null) try {
+            this.bukkitcommandWrapperConstructor = Class.forName("org.bukkit.craftbukkit." + this.nmsVersion + ".command.BukkitCommandWrapper").getDeclaredConstructor(Class.forName("org.bukkit.craftbukkit." + this.nmsVersion + ".CraftServer"), Command.class);
+            this.bukkitcommandWrapperConstructor.setAccessible(true);
+        } catch (NoSuchMethodException | ClassNotFoundException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        Object commandWrapper;
+
+        try {
+            commandWrapper = this.bukkitcommandWrapperConstructor.newInstance(Bukkit.getServer(), command);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        Object a;
+
+        try {
+            a = this.aMethod.invoke(commandDispatcher);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        if (this.registerMethod == null) try {
+            this.registerMethod = Class.forName("org.bukkit.craftbukkit." + this.nmsVersion + ".command.BukkitCommandWrapper").getMethod("register", com.mojang.brigadier.CommandDispatcher.class, String.class);
+            this.registerMethod.setAccessible(true);
+        } catch (NoSuchMethodException | ClassNotFoundException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        try {
+            this.registerMethod.invoke(commandWrapper, a, alias);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void sync() {
+        if (this.syncCommandsMethod == null) try {
+            this.syncCommandsMethod = Class.forName("org.bukkit.craftbukkit." + this.nmsVersion + ".CraftServer").getDeclaredMethod("syncCommands");
+            this.syncCommandsMethod.setAccessible(true);
+        } catch (NoSuchMethodException | ClassNotFoundException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        try {
+            this.syncCommandsMethod.invoke(Bukkit.getServer());
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void unwrap(String command) {
+        if (this.nmsVersion == null) return;
+        if (this.minecraftServerClass == null) try {
+            this.minecraftServerClass = Class.forName("net.minecraft.server." + this.nmsVersion + ".MinecraftServer");
+        } catch (ClassNotFoundException e) {
+            try {
+                this.minecraftServerClass = Class.forName("net.minecraft.server.MinecraftServer");
+            } catch (ClassNotFoundException classNotFoundException) {
+                classNotFoundException.printStackTrace();
+                classNotFoundException.addSuppressed(e);
+                return;
+            }
+        }
+        if (this.getServerMethod == null) try {
+            this.getServerMethod = this.minecraftServerClass.getMethod("getServer");
+            this.getServerMethod.setAccessible(true);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        Object server;
+
+        try {
+            server = this.getServerMethod.invoke(this.minecraftServerClass);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        if (this.vanillaCommandDispatcherField == null) try {
+            this.vanillaCommandDispatcherField = this.minecraftServerClass.getDeclaredField("vanillaCommandDispatcher");
+            this.vanillaCommandDispatcherField.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        Object commandDispatcher = null;
+        try {
+            commandDispatcher = this.vanillaCommandDispatcherField.get(server);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        if (this.bField == null) try {
+            this.bField = Class.forName("net.minecraft.server." + this.nmsVersion + ".CommandDispatcher").getDeclaredField("b");
+            this.bField.setAccessible(true);
+        } catch (NoSuchFieldException | ClassNotFoundException e) {
+            if (this.bField == null) try {
+                this.bField = Class.forName("net.minecraft.commands.CommandDispatcher").getDeclaredField("g");
+                this.bField.setAccessible(true);
+            } catch (NoSuchFieldException | ClassNotFoundException ex) {
+                ex.addSuppressed(e);
+                e.printStackTrace();
+                return;
+            }
+        }
+
+        com.mojang.brigadier.CommandDispatcher b;
+        try {
+            b = (com.mojang.brigadier.CommandDispatcher) this.bField.get(commandDispatcher);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        if (this.removeCommandMethod == null) try {
+            try {
+                this.removeCommandMethod = RootCommandNode.class.getDeclaredMethod("removeCommand", String.class);
+            } catch (NoSuchMethodException | NoSuchMethodError ex) {
+                this.removeCommandMethod = CommandNode.class.getDeclaredMethod("removeCommand", String.class);
+            }
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        try {
+            this.removeCommandMethod.invoke(b.getRoot(), command);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/net/t2code/alias/Spigot/system/BukkitCommandWrap_Useless.java

@@ -0,0 +1,17 @@
+package net.t2code.alias.Spigot.system;
+
+import org.bukkit.command.Command;
+
+public class BukkitCommandWrap_Useless extends BukkitCommandWrap {
+
+    public BukkitCommandWrap_Useless() {
+    }
+
+    @Override
+    public void wrap(Command command, String alias) {
+    }
+
+    @Override
+    public void unwrap(String command) {
+    }
+}

src/main/java/net/t2code/alias/Spigot/system/Load.java

@@ -14,6 +14,7 @@ import net.t2code.alias.Util;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate;
 import net.t2code.t2codelib.SPIGOT.api.register.T2Cregister;
 import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
+import net.t2code.t2codelib.SPIGOT.api.yaml.T2CLibConfig;
 import org.bukkit.Bukkit;
 
 import java.io.File;
@@ -70,7 +71,7 @@ public class Load {
             T2Cregister.listener(new TabEvent(), plugin);
         }
 
-        if (SelectConfig.getBungee()) {
+        if (T2CLibConfig.getBungee()) {
             Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "t2c:bcmd");
         }
         AliasRegisterPermissions.onPermRegister();

src/main/java/net/t2code/alias/Util.java

@@ -8,7 +8,7 @@ public class Util {
     }
 
     public static String getRequiredT2CodeLibVersion() {
-        return "13.4";
+        return "14.2";
     }
 
     public static String getPrefix() {

src/main/resources/Alias/X_aliasDeclaration_X.yml

@@ -74,7 +74,7 @@ Alias:
   # Player with Admin Perm: /server CityBuild
   Admin:
     # Here you can enable or disable the admin function
-    Enable: true
+    Enable: false
     # Here you set the permission for the admin function
     Permission: t2code.alias.admin
     Command:

src/main/resources/SubAlias/X_subAliasDeclaration_X.yml

@@ -73,7 +73,7 @@ SubAlias:
   # Player with Admin Perm: /server CityBuild
   Admin:
     # Here you can enable or disable the admin function
-    Enable: true
+    Enable: false
     # Here you set the permission for the admin function
     Permission: t2code.alias.admin
     Command: