Merge pull request 'CloseInventory' (#2) from CloseInventory into main

Reviewed-on: #2

.idea/artifacts/T2CodeLib_10_1.xml

@@ -1,7 +1,7 @@
 <component name="ArtifactManager">
-  <artifact type="jar" name="T2CodeLib_9.0_Snapshot_1">
+  <artifact type="jar" name="T2CodeLib_10.1">
     <output-path>$PROJECT_DIR$/../../Plugins/T2CodeLib/.jar</output-path>
-    <root id="archive" name="T2CodeLib_9.0_Snapshot_1.jar">
+    <root id="archive" name="T2CodeLib_10.1.jar">
       <element id="module-output" name="T2CodeLib" />
     </root>
   </artifact>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>T2CodeLib</artifactId>
-    <version>9.0</version>
+    <version>10.1</version>
     <packaging>jar</packaging>
 
     <name>T2CodeLib</name>

src/main/java/net/t2code/lib/Bungee/Lib/yamlConfiguration/BConfig.java

@@ -0,0 +1,85 @@
+package net.t2code.lib.Bungee.Lib.yamlConfiguration;
+
+import net.md_5.bungee.config.Configuration;
+import net.t2code.lib.Spigot.Lib.replace.Replace;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BConfig {
+    public static void set(String path, String value, Configuration configuration) {
+        if (!configuration.contains(path)) {
+            configuration.set(path, value);
+        }
+    }
+
+    public static void set(String path, Configuration configuration) {
+        configuration.set(path, null);
+    }
+
+    public static void set(String path, Integer value, Configuration configuration) {
+        if (!configuration.contains(path)) {
+            configuration.set(path, value);
+        }
+    }
+
+    public static void set(String path, Double value, Configuration configuration) {
+        if (!configuration.contains(path)) {
+            configuration.set(path, value);
+        }
+    }
+
+    public static void set(String path, Boolean value, Configuration configuration) {
+        if (!configuration.contains(path)) {
+            configuration.set(path, value);
+        }
+    }
+
+    public static void set(String path, List<String> value, Configuration configuration) {
+        if (!configuration.contains(path)) {
+            configuration.set(path, value);
+        }
+    }
+
+
+    public static String select(String prefix, String path, Configuration configuration) {
+        return Replace.replace(prefix, configuration.getString(path));
+    }
+
+
+    public static Integer selectInt(String path, Configuration configuration) {
+        return (configuration.getInt(path));
+    }
+
+    public static Boolean selectBoolean(String path, Configuration configuration) {
+        return (configuration.getBoolean(path));
+    }
+
+    public static Double selectDouble(String path, Configuration configuration) {
+        return (configuration.getDouble(path));
+    }
+
+    public static List<String> selectList(String path, Configuration configuration) {
+        return (configuration.getStringList(path));
+    }
+
+
+
+    public static List<String> selectList(String prefix, String path, Configuration configuration) {
+        List<String> output = new ArrayList<>();
+        List<String> input = configuration.getStringList(path);
+        for (String st : input) {
+            output.add(Replace.replace(prefix, st));
+        }
+        return output;
+    }
+
+    public static void select(String prefix, List<String> value, String path, Configuration configuration) {
+        List<String> output = new ArrayList<>();
+        List<String> input = configuration.getStringList(path);
+        for (String st : input) {
+            output.add(Replace.replace(prefix, st));
+        }
+        value = output;
+    }
+}

src/main/java/net/t2code/lib/Spigot/Lib/messages/T2CodeTemplate.java

@@ -2,6 +2,7 @@ package net.t2code.lib.Spigot.Lib.messages;
 
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.t2code.lib.Spigot.Lib.replace.Replace;
 import net.t2code.lib.Spigot.Lib.update.UpdateAPI;
 import net.t2code.lib.Spigot.system.Main;
 import org.bukkit.Bukkit;
@@ -78,19 +79,30 @@ public class T2CodeTemplate {
     public static void sendInfo(CommandSender sender, String prefix, String spigot, String discord, List autor, String pluginVersion, String publicVersion) {
         send.sender(sender, prefix + "§4======= " + prefix + " §4=======");
         send.sender(sender, prefix + " §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", ""));
+        if (sender instanceof Player) {
 
+            TextComponent comp2 = new TextBuilder(prefix + " §2Version: §6" + pluginVersion)
+                    .addHover("§8Click to copy").addClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, Replace.removeColorCode(prefix) +" - "+ pluginVersion).build();
+            sender.spigot().sendMessage(comp2);
+            if (!publicVersion.equalsIgnoreCase(pluginVersion)) {
+                UpdateAPI.sendUpdateMsg(prefix, spigot, discord, pluginVersion, publicVersion, (Player) sender);
+            }
+            TextComponent comp3 = new TextBuilder(prefix + " §2Spigot: §6" + spigot)
+                    .addHover("§8Open Spigot").addClickEvent(ClickEvent.Action.OPEN_URL, spigot).build();
+            sender.spigot().sendMessage(comp3);
+            TextComponent comp4 = new TextBuilder(prefix + " §2Discord: §6" + discord)
+                    .addHover("§8Open Discord").addClickEvent(ClickEvent.Action.OPEN_URL, discord).build();
+            sender.spigot().sendMessage(comp4);
+        } else {
             if (publicVersion.equalsIgnoreCase(pluginVersion)) {
                 send.sender(sender, prefix + " §2Version: §6" + pluginVersion);
             } else {
-            if (sender instanceof Player) {
+                UpdateAPI.sendUpdateMsg(prefix, spigot, discord, pluginVersion, publicVersion);
-                Player player = (Player) sender;
-                UpdateAPI.sendUpdateMsg(prefix, spigot, discord, pluginVersion, publicVersion, player);
-            }
             }
             send.sender(sender, prefix + " §2Spigot: §6" + spigot);
             send.sender(sender, prefix + " §2Discord: §6" + discord);
+
+        }
         send.sender(sender, prefix + "§4======= " + prefix + " §4=======");
     }
-
-
 }

src/main/java/net/t2code/lib/Spigot/Lib/register/Register.java

@@ -5,9 +5,6 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.event.Listener;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.util.Collections;
 
 public class Register {
     public static void listener(Listener listener, Plugin plugin) {
@@ -35,4 +32,8 @@ public class Register {
         plugin.getServer().getPluginManager().getPermission(permission).setDefault(setDefault);
         plugin.getServer().getPluginManager().getPermission(permission).getChildren().put(children, setBoolean);
     }
+    public static void permissionDescription(String permission, String description, Plugin plugin) {
+        plugin.getServer().getPluginManager().getPermission(permission).setDescription(description);
+
+    }
 }

src/main/java/net/t2code/lib/Spigot/Lib/replace/Replace.java

@@ -63,6 +63,19 @@ public class Replace {
         return rp;
     }
 
+    public static String removeColorCode(String value){
+        String text = value.replace("&", "§");
+        while(text.contains("§")){
+            int stelle = text.indexOf("§");
+            if(text.length() >= stelle+2) {
+                text = text.substring(0, stelle) + text.substring(stelle + 2);
+            }else{
+                text = text.substring(0, stelle) + text.substring(stelle + 1);
+            }
+        }
+        return (text);
+    }
+
 
     public static List<String> replacePrice(String prefix,Player player, List<String> Text, String price) {
         List<String> rp = new ArrayList();

src/main/java/net/t2code/lib/Spigot/Lib/update/UpdateAPI.java

@@ -55,7 +55,19 @@ public class UpdateAPI {
 
     public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String pluginVersion, String publicVersion) {
         send.console("§4=========== " + Prefix + " §4===========");
+        if (publicVersion.toLowerCase().contains("dev") || publicVersion.toLowerCase().contains("beta") || publicVersion.toLowerCase().contains("snapshot")){
+            if (publicVersion.toLowerCase().contains("dev")){
+                send.console("§6A new §4DEV§6 version was found!");
+            }
+            if (publicVersion.toLowerCase().contains("beta")){
+                send.console("§6A new §2BETA§6 version was found!");
+            }
+            if (publicVersion.toLowerCase().contains("snapshot")){
+                send.console("§6A new §eSNAPSHOT§6 version was found!");
+            }
+        } else {
             send.console("§6A new version was found!");
+        }
         send.console("§6Your version: §c" + pluginVersion + " §7- §6Current version: §a" + publicVersion);
         send.console("§6You can download it here: §e" + Spigot);
         send.console("§6You can find more information on Discord: §e" + Discord);
@@ -67,9 +79,27 @@ public class UpdateAPI {
             return;
         }
         send.player(player, Prefix);
+        if (publicVersion.toLowerCase().contains("dev") || publicVersion.toLowerCase().contains("beta") || publicVersion.toLowerCase().contains("snapshot")){
+            if (publicVersion.toLowerCase().contains("dev")){
+                TextComponent comp = new TextBuilder(Prefix + " §6A new §4DEV§6 version was found!")
+                        .addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build();
+                player.spigot().sendMessage(comp);
+            }
+            if (publicVersion.toLowerCase().contains("beta")){
+                TextComponent comp = new TextBuilder(Prefix + " §6A new §2BETA§6 version was found!")
+                        .addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build();
+                player.spigot().sendMessage(comp);
+            }
+            if (publicVersion.toLowerCase().contains("snapshot")){
+                TextComponent comp = new TextBuilder(Prefix + " §6A new §eSNAPSHOT§6 version was found!")
+                        .addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build();
+                player.spigot().sendMessage(comp);
+            }
+        } else {
             TextComponent comp = new TextBuilder(Prefix + " §6A new version was found!")
                     .addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build();
             player.spigot().sendMessage(comp);
+        }
         TextComponent comp1 = new TextBuilder(Prefix + " §c" + pluginVersion + " §7-> §a" + publicVersion)
                 .addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build();
         player.spigot().sendMessage(comp1);

src/main/java/net/t2code/lib/Spigot/system/CmdExecuter.java

@@ -4,6 +4,7 @@ import net.md_5.bungee.protocol.packet.Commands;
 import net.t2code.lib.Spigot.Lib.messages.T2CodeTemplate;
 import net.t2code.lib.Spigot.Lib.messages.send;
 import net.t2code.lib.Spigot.Lib.update.UpdateAPI;
+import net.t2code.lib.Util;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -22,18 +23,25 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 public class CmdExecuter implements CommandExecutor, TabCompleter {
-    private static Plugin plugin = Main.plugin;
-    private static String prefix = Main.prefix;
-    private static List autor = Main.autor;
-    private static String version = Main.version;
-    private static String spigot = Main.spigot;
-    private static String discord = Main.discord;
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!sender.hasPermission("t2code.admin")){
+            send.sender(sender,"§4No Permission §8t2code.admin");
+            return false;
+        }
         if (args.length == 0) {
-            T2CodeTemplate.sendInfo(sender, prefix, spigot, discord, autor, version, UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion);
+            T2CodeTemplate.sendInfo(sender, Util.getPrefix(), Util.getSpigot(), Util.getDiscord(), Main.autor, Main.version, UpdateAPI.PluginVersionen.get(Main.plugin.getName()).publicVersion);
         } else {
+            switch (args[0].toLowerCase()) {
+                case "info":
+                case "plugin":
+                case "pl":
+                case "version":
+                case "ver":
+                    T2CodeTemplate.sendInfo(sender, Util.getPrefix(), Util.getSpigot(), Util.getDiscord(), Main.autor, Main.version, UpdateAPI.PluginVersionen.get(Main.plugin.getName()).publicVersion);
+                    return false;
+            }
             if ("debug".equals(args[0].toLowerCase())) {
                 if (args.length != 2) {
                     send.sender(sender, "§4Use: §7/t2code debug createReportLog");
@@ -53,6 +61,7 @@ public class CmdExecuter implements CommandExecutor, TabCompleter {
     //TabCompleter
     private static HashMap<String, String> arg1 = new HashMap<String, String>() {{
         put("debug", "t2code.admin");
+        put("info", "t2code.admin");
     }};
 
     @Override

src/main/java/net/t2code/lib/Spigot/system/Main.java

@@ -108,9 +108,11 @@ public final class Main extends JavaPlugin {
         LanguagesCreate.langCreate();
         SelectLibConfig.onSelect();
         SelectLibMsg.onSelect(prefix);
+        if (!Util.getSnapshot()){
             UpdateAPI.onUpdateCheck(plugin, prefix, spigot, spigotID, discord);
-
             Metrics.Bstats(plugin, bstatsID);
+        }
+
         Bukkit.getServer().getPluginManager().registerEvents(new JoinEvent(), plugin);
         T2CodeTemplate.onLoadFooter(prefix, long_);
     }

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

@@ -1,7 +1,7 @@
 package net.t2code.lib;
 
 public class Util {
-    private static Boolean Snapshot = true;
+    private static Boolean Snapshot = false;
 
     private static String Prefix = "§8[§4T2Code§5Lib§8]";
     private static Integer SpigotID = 96388;

target/classes/bungee.yml

@@ -1,5 +1,5 @@
 name: T2CodeLib
-version: 9.0
+version: 10.1
 main: net.t2code.lib.Bungee.BMain
 author: JaTiTV, Jkobs
 description: Libarie from T2Code Plugins

target/classes/plugin.yml

@@ -1,5 +1,5 @@
 name: T2CodeLib
-version: 9.0
+version: 10.1
 main: net.t2code.lib.Spigot.system.Main
 api-version: 1.13
 prefix: T2CodeLib