T2CodeLib load change

pom.xml

@@ -7,7 +7,7 @@
     <groupId>net.t2code</groupId>
     <artifactId>Alias</artifactId>
 
-    <version>1.6_DEV</version>
+    <version>1.6_DEV-1</version>
     <!--version>VERSION_snapshot-0</version-->
     <!--version>VERSION_beta-0</version-->
     <!--version>VERSION_dev-0</version-->
@@ -101,7 +101,7 @@
             <groupId>net.t2code</groupId>
             <artifactId>T2CodeLib</artifactId>
             <version>16.7</version>
-            <classifier>dev-1</classifier>
+            <classifier>dev-3</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -9,6 +9,7 @@ import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate;
 import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
 import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain;
 import org.bukkit.Bukkit;
+import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
@@ -37,12 +38,6 @@ public final class Main extends JavaPlugin {
     public static ArrayList<String> allSubAliases = new ArrayList<>();
     public static ArrayList<String> allForSubAliases = new ArrayList<>();
 
-    // private BukkitCommandWrap bukkitCommandWrap = null;
-    //
-    // public BukkitCommandWrap getBukkitCommandWrap() {
-    //     return this.bukkitCommandWrap;
-    // }
-
 
     @Override
     public void onEnable() {
@@ -50,23 +45,9 @@ public final class Main extends JavaPlugin {
         plugin = this;
         autor = plugin.getDescription().getAuthors();
         version = plugin.getDescription().getVersion();
-        if (!Bukkit.getPluginManager().isPluginEnabled("T2CodeLib")) {
-            getLogger().severe("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
-            getLogger().severe("+               T2CodeLib ist nicht im plugins Ordner,                +");
-            getLogger().severe("+           daher wurde es aus der eigenen Library geladen!           +");
-            getLogger().severe("+     Es wird empfohlen die T2CodeLib als eigenes Plugin zu laden,    +");
-            getLogger().severe("+ um keine Komplikationen mit anderen Plugins von T2Code zu bekommen! +");
-            getLogger().severe("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
-            new T2CodeLibMain().onEnable();
-        }
 
-        //  if (pluginNotFound("T2CodeLib", 96388, Util.getRequiredT2CodeLibVersion())) return; todo
+         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();
-        // }
         if (T2CmcVersion.isMc1_13()) {
             guiCode = "";
         } else guiCode = "§6§8§9§r";

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

@@ -17,28 +17,31 @@ import java.util.List;
 public class Config {
 
     public enum VALUES implements T2CconfigItem{
-        language("plugin.language", "english", "In this option you can set the language of the plugin."),
+        language("plugin.language", "english", true,"In this option you can set the language of the plugin."),
-        updateCheckOnJoin("plugin.updateCheck.onJoin", true,"In this option you can set if players with the permission 't2c.alias.updatemsg' will get an update message on join when an update for the plugin is available."),
+        updateCheckOnJoin("plugin.updateCheck.onJoin", true,true,"In this option you can set if players with the permission 't2c.alias.updatemsg' will get an update message on join when an update for the plugin is available."),
-        updateCheckSeePreReleaseUpdates("plugin.updateCheck.seePreReleaseUpdates", true,"In this option you can set whether you want to receive and display beta and snapshot versions in the update check."),
+        updateCheckSeePreReleaseUpdates("plugin.updateCheck.seePreReleaseUpdates", true,true,"In this option you can set whether you want to receive and display beta and snapshot versions in the update check."),
-        updateCheckTimeInterval("plugin.updateCheck.timeInterval", 60,"In this option you can set the time interval in minutes in which updates should be checked."),
+        updateCheckTimeInterval("plugin.updateCheck.timeInterval", 60,true,"In this option you can set the time interval in minutes in which updates should be checked."),
 
-        buyMessage("buy.message", true,"With this option you can set whether a confirmation should be sent after the payment for an alias for which you have to pay."),
+        buyMessage("buy.message", true,true,"With this option you can set whether a confirmation should be sent after the payment for an alias for which you have to pay."),
-        buyCurrency("buy.currency", "$","With this option you set the currency."),
+        buyCurrency("buy.currency", "$",true,"With this option you set the currency."),
-        buyConfirmDefault("buy.confirm.use", Confirm.COMMAND,"Here you can choose which confirmation method you want to use. (COMMAND, CHAT, GUI)"),
+        buyConfirmDefault("buy.confirm.use", Confirm.COMMAND,true,"Here you can choose which confirmation method you want to use. (COMMAND, CHAT, GUI)"),
-        buyConfirmGuiFillItemDesc("buy.confirm.gui.fillItem", null," ","!! You can change the GUI name and the button texts in the language file !!"," "),
+        buyConfirmGuiFillItemDesc("buy.confirm.gui.fillItem", null,true," ","!! You can change the GUI name and the button texts in the language file !!"," "),
-        buyConfirmGuiFillItemEnabled("buy.confirm.gui.fillItem.enabled", true,"Here you can set if a fillitem should be used in the Confirm GUI."),
+        buyConfirmGuiFillItemEnabled("buy.confirm.gui.fillItem.enabled", true,true,"Here you can set if a fillitem should be used in the Confirm GUI."),
-        buyConfirmGuiFillItem("buy.confirm.gui.fillItem.material", T2CitemVersion.getBlackStainedGlassPane().getType().toString(),"Here you can set which fillitem should be used in the Confirm GUI."),
+        buyConfirmGuiFillItem("buy.confirm.gui.fillItem.material", T2CitemVersion.getBlackStainedGlassPane().getType().toString(),true,"Here you can set which fillitem should be used in the Confirm GUI."),
-        buyConfirmGuiConfirm("buy.confirm.gui.confirm.material", T2CitemVersion.getGreenWool().getType().toString(),"Here you can set the material for the confirmation button."),
+        buyConfirmGuiConfirm("buy.confirm.gui.confirm.material", T2CitemVersion.getGreenWool().getType().toString(),true,"Here you can set the material for the confirmation button."),
-        buyConfirmGuiCancel("buy.confirm.gui.cancel.material",  T2CitemVersion.getRedWool().getType().toString(),"Here you can set the material for the cancel button."),
+        buyConfirmGuiCancel("buy.confirm.gui.cancel.material",  T2CitemVersion.getRedWool().getType().toString(),true,"Here you can set the material for the cancel button."),
-        subAliasTab("subAlias.tabComplete", true,"Here you can set if subcommands should be displayed as tabComplete.");
+        subAliasTab("subAlias.tabComplete", true,true,"Here you can set if subcommands should be displayed as tabComplete."),
+        ;
 
         private final String path;
         private Object value;
+        private final boolean forceSet;
         private final List<String> comments;
 
-        VALUES(String path, Object value, String... comments) {
+        VALUES(String path, Object value,boolean forceSet, String... comments) {
             this.path = path;
             this.value = value;
+            this.forceSet=forceSet;
             this.comments = new ArrayList<>(Arrays.asList(comments));
         }
 
@@ -52,6 +55,11 @@ public class Config {
             return value;
         }
 
+        @Override
+        public boolean getForceSet() {
+            return forceSet;
+        }
+
         @Override
         public List<String> getComments() {
             return comments;
@@ -67,6 +75,7 @@ public class Config {
         long long_ = System.currentTimeMillis();
         T2CconfigWriter.createConfig(new File(Main.getPath(), "config.yml"), VALUES.values(), Util.getConfigLogo());
 
+
         T2Csend.console(Util.getPrefix() + " §2The config.yml was loaded successfully §7- §e" + (System.currentTimeMillis() - long_) + "ms");
     }