15.9

- In MiniMessage messages placeholders were erroneously not supported by PlaceholderAPI
- Smaller API changes in T2Csend

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <list size="2">

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>T2CodeLib</artifactId>
-    <version>15.8_dev</version>
+    <version>15.9</version>
     <!--version>VERSION_snapshot-0</version-->
     <!--version>VERSION_beta-0</version-->
     <!--version>VERSION_dev-0</version-->
@@ -27,8 +27,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <source>9</source>
+                    <target>9</target>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ccmd.java

@@ -1,25 +1,71 @@
 package net.t2code.t2codelib.SPIGOT.api.commands;
 
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import net.t2code.t2codelib.SPIGOT.system.T2CbungeeCommandSenderReciver;
+import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.rmi.MarshalledObject;
+import java.util.Map;
 
 public class T2Ccmd {
-    public static void console(String cmd) {
-        if (cmd.contains("!onBungee")){
-            T2CbungeeCommandSenderReciver.sendToBungee(null, cmd.replace("!onBungee", ""), true);
-        }else Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), cmd);
+    public static void console(String cmdInput) {
+        Map.Entry<String,Integer> map = delay(cmdInput);
+        int delay = map.getValue();
+        String cmd = map.getKey();
+        Bukkit.getScheduler().runTaskLater(T2CodeLibMain.getPlugin(), new Runnable() {
+            @Override
+            public void run() {
+                if (cmd.contains("!onBungee")) {
+                    T2CbungeeCommandSenderReciver.sendToBungee(null, cmd.replace("!onBungee", ""), true);
+                } else Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), cmd);
+            }
+        }, delay);
     }
 
-    public static void player(Player player, String cmd) {
-        if (cmd.contains("!asConsole")) {
-            if (cmd.contains("!onBungee")) {
-                T2CbungeeCommandSenderReciver.sendToBungee(player, cmd.replace("!asConsole", "").replace("!onBungee", ""), true);
-            } else console(cmd.replace("!asConsole", ""));
-        } else {
-            if (cmd.contains("!onBungee")) {
-                T2CbungeeCommandSenderReciver.sendToBungee(player, cmd.replace("!onBungee", ""), false);
-            } else player.chat("/" + cmd);
-        }
+    public static void player(Player player, String cmdInput) {
+        Map.Entry<String,Integer> map = delay(cmdInput);
+        int delay = map.getValue();
+        String cmd = map.getKey();
+        Bukkit.getScheduler().runTaskLater(T2CodeLibMain.getPlugin(), new Runnable() {
+            @Override
+            public void run() {
+                if (cmd.contains("!asConsole")) {
+                    if (cmd.contains("!onBungee")) {
+                        T2CbungeeCommandSenderReciver.sendToBungee(player, cmd.replace("!asConsole", "").replace("!onBungee", ""), true);
+                    } else console(cmd.replace("!asConsole", ""));
+                } else {
+                    if (cmd.contains("!onBungee")) {
+                        T2CbungeeCommandSenderReciver.sendToBungee(player, cmd.replace("!onBungee", ""), false);
+                    } else player.chat("/" + cmd);
+                }
+            }
+        }, delay);
     }
+
+    private static Map.Entry<String, Integer> delay(@NotNull String cmdInput) {
+        T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), "Input: " + cmdInput);
+        int delay = 0;
+        String cmd;
+        if (cmdInput.contains("!delay:")) {
+            int i = cmdInput.indexOf("!delay:") + 7;
+            String s2 = cmdInput.substring(i);
+            int i2 = 1;
+            if(s2.contains(" ")) {
+                i2 = s2.indexOf(" ");
+            }else{
+                i2 = s2.length();
+            }
+            delay = Integer.parseInt(cmdInput.substring(i, i + i2));
+            cmd = cmdInput.replace("!delay:" + delay, "");
+
+        } else cmd = cmdInput;
+
+        return Map.entry(cmd, delay);
+    }
+
+
 }

src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java

@@ -8,25 +8,11 @@ import org.bukkit.entity.Player;
 
 public class T2ChoverModule {
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * The T2Code Hover Module will be removed soon,<br/>
-     * please use 'T2CminiMessage.sendPlayerMiniMessage(msg, player);'<br/>
-     * and the Kyori MiniMessage format!
-     */
-    @Deprecated
     public static void modulePlayer(String text, String hover, String action, String actionValue, Player player) {
         modulePlayer((text != null ? text : "null") + "/*/" + (hover != null ? hover : "null") + "/*/" + (action != null ? action : "null")
                 + "/*/" + (actionValue != null ? actionValue : "null"), player);
     }
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * The T2Code Hover Module will be removed soon,<br/>
-     * please use 'T2CminiMessage.sendPlayerMiniMessage(msg, player);'<br/>
-     * and the Kyori MiniMessage format!
-     */
-    @Deprecated
     public static void modulePlayer(String msg, Player player) {
         if (msg.contains("/*/")) {
             t2cmodule(msg, player);
@@ -35,24 +21,10 @@ public class T2ChoverModule {
         T2CminiMessage.sendPlayerMiniMessage(msg, player);
     }
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * The T2Code Hover Module will be removed soon,<br/>
-     * please use 'T2CminiMessage.sendSenderMiniMessage(msg, sender);'<br/>
-     * and the Kyori MiniMessage format!
-     */
-    @Deprecated
     public static void moduleSender(String msg, CommandSender sender) {
         T2CminiMessage.sendSenderMiniMessage(msg, sender);
     }
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * The T2Code Hover Module will be removed soon,<br/>
-     * please use 'T2CminiMessage.sendPlayerMiniMessage(msg, player);'<br/>
-     * and the Kyori MiniMessage format!
-     */
-    @Deprecated
     public static void moduleConsole(String msg) {
         if (T2CodeLibMain.getMmIsLoad()) {
             T2CminiMessage.sendConsoleMiniMessage(msg);
@@ -61,13 +33,6 @@ public class T2ChoverModule {
         Bukkit.getConsoleSender().sendMessage(msg);
     }
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * The T2Code Hover Module will be removed soon,<br/>
-     * please use 'T2CminiMessage.sendPlayerMiniMessage(msg, player);'<br/>
-     * and the Kyori MiniMessage format!
-     */
-    @Deprecated
     private static void t2cmodule(String msg, Player player) {
         String[] split = msg.split("/\\*/");
         int i = split.length;

src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java

@@ -11,7 +11,12 @@ public class T2CminiMessage {
     private static final BukkitAudiences bukkitAudiences = T2CodeLibMain.getPlugin().getAdventure();
 
     public static void sendSenderMiniMessage(String msg, CommandSender sender) {
-       bukkitAudiences.sender(sender).sendMessage(replace(msg));
+        String string = "";
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+            string =T2Creplace.replace("",player,msg);
+        } else string = msg;
+        bukkitAudiences.sender(sender).sendMessage(replace(string));
     }
 
     public static void sendConsoleMiniMessage(String msg) {
@@ -19,7 +24,7 @@ public class T2CminiMessage {
     }
 
     public static void sendPlayerMiniMessage(String msg, Player player) {
-        bukkitAudiences.player(player).sendMessage(replace(msg));
+        bukkitAudiences.player(player).sendMessage(replace(T2Creplace.replace("", player, msg)));
     }
 
     protected static Component replace(String text) {

src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Csend.java

@@ -7,71 +7,47 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Level;
 
 public class T2Csend {
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed!
-     */
-    @Deprecated
     public static void console(String msg) {
         if (msg == null || msg.contains("[empty]")) return;
         T2ChoverModule.moduleConsole(msg);
     }
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed!
-     */
-    @Deprecated
     public static void player(Player player, String msg) {
         if (msg == null || msg.contains("[empty]")) return;
         T2ChoverModule.modulePlayer(msg, player);
     }
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed!
-     */
-    @Deprecated
     public static void sender(CommandSender sender, String msg) {
         if (msg == null || msg.contains("[empty]")) return;
         T2ChoverModule.moduleSender(msg, sender);
     }
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed!
-     */
-    @Deprecated
     public static void console(Object object) {
-        String msg = String.valueOf(object);
-        if (msg == null || msg.contains("[empty]")) return;
-        T2ChoverModule.moduleConsole(msg);
+        for (String msg : list(object)){
+            if (msg == null || msg.contains("[empty]")) continue;
+            T2ChoverModule.moduleConsole(msg);
+        }
     }
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed!
-     */
-    @Deprecated
     public static void player(Player player, Object object) {
-        String msg = String.valueOf(object);
-        if (msg == null || msg.contains("[empty]")) return;
-        T2ChoverModule.modulePlayer(msg, player);
+        for (String msg : list(object)){
+            if (msg == null || msg.contains("[empty]")) continue;
+            T2ChoverModule.modulePlayer(msg, player);
+        }
     }
 
-    /**
-     * @deprecated reason this method is deprecated <br/>
-     * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed!
-     */
-    @Deprecated
+
     public static void sender(CommandSender sender, Object object) {
-        String msg = String.valueOf(object);
-        if (msg == null || msg.contains("[empty]")) return;
-        T2ChoverModule.moduleSender(msg, sender);
+        for (String msg : list(object)){
+            if (msg == null || msg.contains("[empty]")) return;
+            T2ChoverModule.moduleSender(msg, sender);
+        }
     }
 
     public static void title(Player player, @Nullable String title, @Nullable String subtitle) {
@@ -106,4 +82,16 @@ public class T2Csend {
     public static void error(Plugin plugin, String msg) {
         plugin.getLogger().log(Level.SEVERE, msg);
     }
+
+    private static ArrayList<String> list(Object object){
+        ArrayList<String> list = new ArrayList<>();
+
+        if (object instanceof List){
+            list= (ArrayList<String>) object;
+        }
+        if (object instanceof String){
+            list.add((String) object);
+        }
+        return list;
+    }
 }