Merge pull request '9.0' (#1) from CloseInventory into main

Reviewed-on: #1

.idea/artifacts/T2CodeLib_9_0.xml

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

pom.xml

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

src/main/java/net/t2code/lib/Bungee/BMain.java

@@ -12,11 +12,11 @@ public final class BMain extends Plugin {
     public static String Version;
     public static String Autor;
 
-    public static String Prefix = Util.Prefix;
+    public static String Prefix = Util.getPrefix();
-    public static Integer SpigotID = Util.SpigotID;
+    public static Integer SpigotID = Util.getSpigotID();
-    public static Integer BstatsID = Util.BstatsID;
+    public static Integer BstatsID = Util.getBstatsID();
-    public static String Spigot = Util.Spigot;
+    public static String Spigot = Util.getSpigot();
-    public static String Discord = Util.Discord;
+    public static String Discord = Util.getDiscord();
 
 
     @Override

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;
@@ -29,8 +30,13 @@ public class T2CodeTemplate {
         send.console(prefix + " §4    §e| §2Discord: §6" + discord);
         send.console(prefix + " §4    §e-------------------");
         if (version.toLowerCase().contains("dev") || version.toLowerCase().contains("snapshot") || version.toLowerCase().contains("beta")) {
-            send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! Some features may not be working as expected. Please report all bugs here: http://dc.t2code.net");
+            send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! Some features may not be working as expected. Please report all bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!");
             send.console(prefix + " §4    §e-------------------");
+            try {
+                Thread.sleep(5000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
         //onLoadSeparateStroke(prefix);
         return long_;
@@ -73,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/minecraftVersion/MCVersion.java

@@ -16,6 +16,7 @@ public class MCVersion {
     public static boolean minecraft1_16;
     public static boolean minecraft1_17;
     public static boolean minecraft1_18;
+    public static boolean minecraft1_19;
     public static void onCheck(){
         isVersion = Bukkit.getServer().getVersion();
         isBuckitVersion = Bukkit.getServer().getBukkitVersion();
@@ -30,5 +31,6 @@ public class MCVersion {
         minecraft1_16 = Bukkit.getServer().getClass().getPackage().getName().contains("1_16");
         minecraft1_17 = Bukkit.getServer().getClass().getPackage().getName().contains("1_17");
         minecraft1_18 = Bukkit.getServer().getClass().getPackage().getName().contains("1_18");
+        minecraft1_19 = Bukkit.getServer().getClass().getPackage().getName().contains("1_19");
     }
 }

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

@@ -6,6 +6,7 @@ import net.md_5.bungee.api.chat.TextComponent;
 
 import net.t2code.lib.Spigot.Lib.messages.TextBuilder;
 import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.lib.Spigot.system.Main;
 import net.t2code.lib.Spigot.system.config.SelectLibConfig;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -81,9 +82,12 @@ public class UpdateAPI {
     private static Boolean noUpdate = true;
 
     public static void onUpdateCheck(Plugin plugin, String Prefix, String Spigot, int SpigotID, String Discord) {
+        onUpdateCheck(plugin, Prefix, Spigot, SpigotID, Discord, 60);
+    }
+
+    public static void onUpdateCheck(Plugin plugin, String Prefix, String Spigot, int SpigotID, String Discord, Integer timeInMin) {
         int taskID = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
             public void run() {
-
                 (new UpdateAPI((JavaPlugin) plugin, SpigotID)).getVersion((update_version) -> {
                     UpdateObject update = new UpdateObject(
                             plugin.getName(),
@@ -91,7 +95,6 @@ public class UpdateAPI {
                             update_version
                     );
                     UpdateAPI.PluginVersionen.put(plugin.getName(), update);
-
                     if (!plugin.getDescription().getVersion().equalsIgnoreCase(update_version)) {
                         noUpdate = true;
                         new BukkitRunnable() {
@@ -101,7 +104,6 @@ public class UpdateAPI {
                             }
                         }.runTaskLater(plugin, 600L);
                     } else {
-
                         if (noUpdate) {
                             send.console(Prefix + " §2No update found.");
                             noUpdate = false;
@@ -109,7 +111,7 @@ public class UpdateAPI {
                     }
                 }, Prefix, plugin.getDescription().getVersion());
             }
-        }, 0L, 20 * 60 * 60L);
+        }, 0L, timeInMin * 60 * 20L);
     }
 
     private JavaPlugin plugin;

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,29 +23,36 @@ 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");
+                    send.sender(sender, "§4Use: §7/t2code debug createReportLog");
                     return false;
                 }
                 if ("createreportlog".equals(args[1].toLowerCase())) {
 
                     CreateReportLog.create(sender);
 
-                } else send.sender(sender,"§4Use: §7/t2code debug createReportLog");
+                } else send.sender(sender, "§4Use: §7/t2code debug createReportLog");
-            } else send.sender(sender,"§4Use: §7/t2code debug createReportLog");
+            } else send.sender(sender, "§4Use: §7/t2code debug createReportLog");
         }
         return false;
     }
@@ -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/JoinEvent.java

@@ -14,6 +14,6 @@ public class JoinEvent implements Listener {
     @EventHandler
     public void onJoinEvent(PlayerLoginEvent event) {
         Player player = event.getPlayer();
-        UpdateAPI.join(Main.plugin, Util.Prefix, "t2code.lib.updatemsg", event.getPlayer(), Main.spigot, Main.discord);
+        UpdateAPI.join(Main.plugin, Util.getPrefix(), "t2code.lib.updatemsg", event.getPlayer(), Main.spigot, Main.discord);
     }
 }

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

@@ -16,10 +16,12 @@ import net.t2code.lib.Util;
 import net.t2code.lib.Spigot.system.config.SelectLibConfig;
 import net.t2code.lib.Spigot.system.languages.SelectLibMsg;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
 import java.util.List;
+import java.util.Objects;
 
 public final class Main extends JavaPlugin {
 
@@ -34,11 +36,11 @@ public final class Main extends JavaPlugin {
     public static List<String> autor;
     public static String version;
 
-    public static String prefix = Util.Prefix;
+    public static String prefix = Util.getPrefix();
-    public static Integer spigotID = Util.SpigotID;
+    public static Integer spigotID = Util.getSpigotID();
-    public static Integer bstatsID = Util.BstatsID;
+    public static Integer bstatsID = Util.getBstatsID();
-    public static String spigot = Util.Spigot;
+    public static String spigot = Util.getSpigot();
-    public static String discord = Util.Discord;
+    public static String discord = Util.getDiscord();
 
     @Override
     public void onEnable() {
@@ -48,6 +50,16 @@ public final class Main extends JavaPlugin {
         version = plugin.getDescription().getVersion();
         Long long_;
         long_ = T2CodeTemplate.onLoadHeader(prefix, autor, version, spigot, discord);
+        if (Util.getSnapshot()){
+            send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! §4This is a trial version! §eSome features may not be working as expected. Please report all bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!");
+            send.console(prefix + " §4    §e-------------------");
+            try {
+                Thread.sleep(5000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
         //send.console("§4 _|_|_|_|_|    _|_|      _|_|_|                  _|            ");
         //send.console("§4     _|      _|    _|  _|          _|_|      _|_|_|    _|_|    ");
         //send.console("§4     _|          _|    _|        _|    _|  _|    _|  _|_|_|_|  ");
@@ -61,8 +73,13 @@ public final class Main extends JavaPlugin {
         }
         NMSVersion.onCheck();
         MCVersion.onCheck();
-        if (MCVersion.minecraft1_18){
+        if (MCVersion.minecraft1_19){
-            send.warning(this, "The 1.18 is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net");
+            send.warning(this, "The 1.19 is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net");
+            try {
+                Thread.sleep(5000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
         ItemVersion.scan();
         send.console(Main.prefix + " §3Server run on: §6" + MCVersion.isVersion + " / " + NMSVersion.isNMS);
@@ -91,8 +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_);
     }
@@ -100,6 +120,11 @@ public final class Main extends JavaPlugin {
     @Override
     public void onDisable() {
         // Plugin shutdown logic
+        if (SelectLibConfig.InventoriesCloseByServerStop){
+            for (Player player : Bukkit.getOnlinePlayers()){
+                player.closeInventory();
+            }
+        }
         Vault.vaultDisable();
         T2CodeTemplate.onDisable(prefix, autor, version, spigot, discord);
     }

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

@@ -0,0 +1,33 @@
+package net.t2code.lib.Spigot.system;
+
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Scanner;
+import java.util.function.Consumer;
+
+public class UpdateChecker {
+    private final JavaPlugin plugin;
+    private final int resourceId;
+
+    public UpdateChecker(JavaPlugin plugin, int resourceId) {
+        this.plugin = plugin;
+        this.resourceId = resourceId;
+    }
+
+    public void getVersion(final Consumer<String> consumer) {
+        Bukkit.getScheduler().runTaskAsynchronously(this.plugin, () -> {
+            try (InputStream inputStream = new URL("https://api.spigotmc.org/legacy/update.php?resource=" + this.resourceId).openStream(); Scanner scanner = new Scanner(inputStream)) {
+                if (scanner.hasNext()) {
+                    consumer.accept(scanner.next());
+                }
+            } catch (IOException exception) {
+                plugin.getLogger().info("Unable to check for updates: " + exception.getMessage());
+            }
+        });
+    }
+}

src/main/java/net/t2code/lib/Spigot/system/config/ConfigCreate.java

@@ -12,6 +12,7 @@ import java.io.IOException;
 public class ConfigCreate {
 
     private static Boolean UpdateCheckOnJoin = true;
+    private static Integer UpdateCheckTimeInterval = 60;
     private static Boolean Debug = false;
     private static String language = "english";
 
@@ -38,11 +39,13 @@ public class ConfigCreate {
         File config = new File(Main.getPath(), "config.yml");
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
 
-        Config.set("Plugin.UpdateCheckOnJoin", UpdateCheckOnJoin, yamlConfiguration);
+        Config.set("Plugin.UpdateCheck.OnJoin", UpdateCheckOnJoin, yamlConfiguration);
+        Config.set("Plugin.UpdateCheck.TimeInterval", UpdateCheckTimeInterval, yamlConfiguration);
         Config.set("Plugin.language", language, yamlConfiguration);
 
         Config.set("BungeeCord.Enable", Bungee, yamlConfiguration);
         Config.set("BungeeCord.ThisServer", thisServer, yamlConfiguration);
+        Config.set("Player.Inventories.CloseByServerStop", true, yamlConfiguration);
 
        // Config.set("Storage.MySQL.Enable", mySQL, yamlConfiguration);
        // Config.set("Storage.Type", Storage, yamlConfiguration);

src/main/java/net/t2code/lib/Spigot/system/config/SelectLibConfig.java

@@ -9,16 +9,20 @@ public class SelectLibConfig {
 
 
     public static Boolean UpdateCheckOnJoin;
+    public static Integer UpdateCheckTimeInterval;
     public static Boolean Debug;
     public static String language;
+    public static Boolean InventoriesCloseByServerStop;
 
     public static void onSelect() {
         File config = new File(Main.getPath(), "config.yml");
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
 
-        UpdateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.UpdateCheckOnJoin");
+        UpdateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.UpdateCheck.OnJoin");
+        UpdateCheckTimeInterval = yamlConfiguration.getInt("Plugin.UpdateCheck.TimeInterval");
         Debug = yamlConfiguration.getBoolean("Plugin.Debug");
         language = yamlConfiguration.getString("Plugin.language");
+        InventoriesCloseByServerStop = yamlConfiguration.getBoolean("Player.Inventories.CloseByServerStop");
 
     }
 }

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

@@ -1,9 +1,35 @@
 package net.t2code.lib;
 
 public class Util {
-    public static String Prefix = "§8[§4T2Code§5Lib§8]";
+    private static Boolean Snapshot = false;
-    public static Integer SpigotID = 96388;
+
-    public static Integer BstatsID = 12518;
+    private static String Prefix = "§8[§4T2Code§5Lib§8]";
-    public static String Spigot = "https://www.spigotmc.org/resources/" + SpigotID;
+    private static Integer SpigotID = 96388;
-    public static String Discord = "http://dc.t2code.net";
+    private static Integer BstatsID = 12518;
+    private static String Spigot = "https://www.spigotmc.org/resources/" + SpigotID;
+    private static String Discord = "http://dc.t2code.net";
+
+    public static String getPrefix() {
+        return Prefix;
+    }
+
+    public static Integer getSpigotID() {
+        return SpigotID;
+    }
+
+    public static Integer getBstatsID() {
+        return BstatsID;
+    }
+
+    public static String getSpigot() {
+        return Spigot;
+    }
+
+    public static String getDiscord() {
+        return Discord;
+    }
+
+    public static Boolean getSnapshot(){
+        return Snapshot;
+    }
 }

target/classes/bungee.yml

@@ -1,5 +1,5 @@
 name: T2CodeLib
-version: 8.1
+version: 9.0
 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: 8.1
+version: 9.0
 main: net.t2code.lib.Spigot.system.Main
 api-version: 1.13
 prefix: T2CodeLib