Add spark integration

README.md

@@ -52,6 +52,27 @@ Placeholders are delimited by '-'. Since they're applied with a replace, errors
    Maximum supported cooldown is 12 Hours aka 43200 seconds. Cooldowns are not saved to file, so they reset on server reload/restart.
    Use for example the player placeholder inside aac's configuration as part of the arbitrarykey.
 
+#### With [spark](https://spark.lucko.me/]) installed
+- ```tps:<window>```\
+**Windows:** 5s, 10s, 1m, 5m, 15m
+- ```mspt:<function[<arg>, <arg2*>]>```\
+**Functions:** min[window], max[window], mean[window], median[window], percentile[percentile, window]\
+**Windows:** 10s, 1m\
+**Returns:** the tick time in milliseconds\
+**Examples**:
+  - mspt:min[10s]
+  - mspt:percentile[95, 1m]
+
+- ```cpu:<function[<window>]>```\
+  **Functions:** sys[window], proc[window]\
+  **Windows:** 10s, 1m, 15m\
+  **Returns:** on a scale from 0.0 to 1.0\
+  **Examples**:
+    - mspt:sys[10s]
+    - mspt:proc[1m]
+
+**Note:** ```tps``` without parameters will stop working if spark is installed!
+
 ### Multi command / delayed commands
 In the 'do' clause of the statement, multiple commands can be executed at once, and selected commands can be delayed if desired. The command delimiter is ```/<delay>/```, where the integer between ```/``` and ```/``` denotes the delay before the command should be executed in ticks. Here are some examples:
 

pom.xml

@@ -13,6 +13,10 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -34,17 +38,23 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>me.lucko</groupId>
+            <artifactId>spark-api</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
         <defaultGoal>clean package</defaultGoal>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.11.0</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>

src/main/java/me/konsolas/conditionalcommands/ConditionalCommands.java

@@ -1,6 +1,8 @@
 package me.konsolas.conditionalcommands;
 
 import me.konsolas.conditionalcommands.placeholders.PlaceholderCooldown;
+import me.konsolas.conditionalcommands.placeholders.PlaceholderTPSBukkit;
+import me.konsolas.conditionalcommands.placeholders.PlaceholderTPSSpark;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -20,6 +22,10 @@ public void onEnable() {
         saveDefaultConfig();
 
         getLogger().info("Initializing placeholders...");
+        Placeholders.TPS.setPlaceHolder(Bukkit.getPluginManager().isPluginEnabled("spark")
+                ? new PlaceholderTPSSpark()
+                : new PlaceholderTPSBukkit());
+
         for (Placeholders placeholder : Placeholders.values()) {
             placeholder.getPlaceholder().init(this);
         }
@@ -182,7 +188,7 @@ private void dispatchCommand(final CommandSender sender, String command) {
                     }
 
                     final String cmd = command.substring(cmdStart, cmdEnd).trim();
-                    
+
                     if (delay <= 0) {
                         protectedDispatch(sender, cmd);
                     } else {

src/main/java/me/konsolas/conditionalcommands/Placeholders.java

@@ -4,7 +4,9 @@
 
 enum Placeholders {
     PING(new PlaceholderPing()),
-    TPS(new PlaceholderTPS()),
+    TPS(null),
+    MSPT(new PlaceholderMSPT()),
+    CPU(new PlaceholderCPU()),
     TIME_ONLINE(new PlaceholderTimeOnline()),
     PLAYER_COUNT(new PlaceholderPlayerCount()),
     UPTIME(new PlaceholderUptime()),
@@ -14,7 +16,7 @@ enum Placeholders {
     CHANCE(new PlaceholderChance()),
     COOLDOWN(new PlaceholderCooldown());
 
-    private final Placeholder placeholder;
+    private Placeholder placeholder;
 
     Placeholders(Placeholder placeholder) {
         this.placeholder = placeholder;
@@ -23,4 +25,8 @@ enum Placeholders {
     public Placeholder getPlaceholder() {
         return placeholder;
     }
+
+    public void setPlaceHolder(Placeholder placeholder) {
+        this.placeholder = placeholder;
+    }
 }

src/main/java/me/konsolas/conditionalcommands/placeholders/AbstractParameteredPlaceholder.java

@@ -10,7 +10,7 @@ public abstract class AbstractParameteredPlaceholder implements Placeholder {
     private final Pattern pattern;
 
     AbstractParameteredPlaceholder(String base) {
-        this.pattern = Pattern.compile("-" + base + ":([A-Za-z0-9%._]*)-");
+        this.pattern = Pattern.compile("-" + base + ":([A-Za-z0-9%._]+(\\[[^]]*])?)-");
     }
 
     @Override
@@ -25,7 +25,9 @@ public String doSubstitution(String input, Player player) {
         Matcher matcher = pattern.matcher(input);
 
         while (matcher.find()) {
-            input = input.replaceAll(Pattern.quote(matcher.group()), getSub(player, matcher.group(1)));
+            String fullMatch = matcher.group(0);
+            String param = matcher.group(1);
+            input = input.replace(fullMatch, getSub(player, param));
         }
 
         return input;

src/main/java/me/konsolas/conditionalcommands/placeholders/PlaceholderCPU.java

@@ -0,0 +1,38 @@
+package me.konsolas.conditionalcommands.placeholders;
+
+import me.konsolas.conditionalcommands.providers.CPUProviderSpark;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class PlaceholderCPU extends AbstractParameteredPlaceholder {
+
+    private CPUProviderSpark cpu;
+
+    public PlaceholderCPU() {
+        super("cpu");
+    }
+
+    @Override
+    protected String getSub(Player player, String param) {
+        if (cpu == null) {
+            throw new RuntimeException("Cannot do cpu placeholder because spark is not installed");
+        }
+
+        return cpu.getValue(param).toString();
+    }
+
+    @Override
+    public void init(Plugin plugin) {
+        Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
+            @Override
+            public void run() {
+                if (Bukkit.getPluginManager().isPluginEnabled("spark")) {
+                    cpu = new CPUProviderSpark();
+                } else {
+                    Bukkit.getLogger().warning("Spark is not installed!");
+                }
+            }
+        }, 20);
+    }
+}

src/main/java/me/konsolas/conditionalcommands/placeholders/PlaceholderMSPT.java

@@ -0,0 +1,38 @@
+package me.konsolas.conditionalcommands.placeholders;
+
+import me.konsolas.conditionalcommands.providers.MSPTProviderSpark;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class PlaceholderMSPT extends AbstractParameteredPlaceholder {
+
+    private MSPTProviderSpark mspt;
+
+    public PlaceholderMSPT() {
+        super("mspt");
+    }
+
+    @Override
+    protected String getSub(Player player, String param) {
+        if (mspt == null) {
+            throw new RuntimeException("Cannot do mspt placeholder because spark is not installed");
+        }
+
+        return mspt.getValue(param).toString();
+    }
+
+    @Override
+    public void init(Plugin plugin) {
+        Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
+            @Override
+            public void run() {
+                if (Bukkit.getPluginManager().isPluginEnabled("spark")) {
+                    mspt = new MSPTProviderSpark();
+                } else {
+                    Bukkit.getLogger().warning("Spark is not installed!");
+                }
+            }
+        }, 20);
+    }
+}

src/main/java/me/konsolas/conditionalcommands/placeholders/PlaceholderTPSBukkit.java

@@ -0,0 +1,24 @@
+package me.konsolas.conditionalcommands.placeholders;
+
+import me.konsolas.conditionalcommands.providers.Provider;
+import me.konsolas.conditionalcommands.providers.TPSProviderBukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class PlaceholderTPSBukkit extends AbstractStandardPlaceholder {
+    private Provider<Double> tps;
+
+    public PlaceholderTPSBukkit() {
+        super("tps");
+    }
+
+    @Override
+    protected double getStat(Player player) {
+        return tps.getValue();
+    }
+
+    @Override
+    public void init(Plugin plugin) {
+        tps = new TPSProviderBukkit(plugin);
+    }
+}

src/main/java/me/konsolas/conditionalcommands/placeholders/PlaceholderTPSSpark.java

@@ -0,0 +1,32 @@
+package me.konsolas.conditionalcommands.placeholders;
+
+import me.konsolas.conditionalcommands.providers.ParameteredProvider;
+import me.konsolas.conditionalcommands.providers.TPSProviderSpark;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class PlaceholderTPSSpark extends AbstractParameteredPlaceholder {
+    private ParameteredProvider<Double> tps;
+
+    public PlaceholderTPSSpark() {
+        super("tps");
+    }
+
+    @Override
+    protected String getSub(Player player, String param) {
+        return tps.getValue(param).toString();
+    }
+
+    @Override
+    public void init(Plugin plugin) {
+        Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
+            @Override
+            public void run() {
+                if (Bukkit.getPluginManager().isPluginEnabled("spark")) {
+                    tps = new TPSProviderSpark();
+                }
+            }
+        }, 20);
+    }
+}