cooldown placeholders

pom.xml

@@ -7,7 +7,7 @@
     <groupId>me.SuperRonanCraft</groupId>
     <artifactId>BetterRTP</artifactId>
     <packaging>jar</packaging>
-    <version>3.4.5-DEV</version>
+    <version>3.4.5</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java

@@ -1,26 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import br.net.fabiozumbi12.RedProtect.Bukkit.RedProtect;
+import me.SuperRonanCraft.BetterRTP.references.depends.regionPlugins.REGIONPLUGINS;
-import com.bekvon.bukkit.residence.Residence;
-import com.griefdefender.api.GriefDefender;
-import com.griefdefender.api.claim.Claim;
-import com.hakan.claimsystem.api.ClaimAPI;
-import com.massivecraft.factions.Board;
-import com.massivecraft.factions.FLocation;
-import com.massivecraft.factions.Faction;
-import com.palmergames.bukkit.towny.TownyAPI;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.regions.RegionContainer;
-import com.sk89q.worldguard.protection.regions.RegionQuery;
-import com.songoda.ultimateclaims.UltimateClaims;
-import me.RonanCraft.Pueblos.Pueblos;
-import me.SuperRonanCraft.BetterRTP.BetterRTP;
-import me.SuperRonanCraft.BetterRTP.references.depends.regionPlugins.*;
-import me.SuperRonanCraft.BetterRTP.references.settings.SoftDepends;
-import me.angeschossen.lands.api.integration.LandsIntegration;
-import me.ryanhamshire.GriefPrevention.GriefPrevention;
 import org.bukkit.Location;
 
 public class RTPPluginValidation {

src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPlaceholderAPI.java

@@ -3,7 +3,10 @@ package me.SuperRonanCraft.BetterRTP.references.depends;
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer;
 import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData;
+import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownData;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -32,6 +35,27 @@ public class DepPlaceholderAPI extends PlaceholderExpansion {
         PlayerData data = HelperPlayer.getData(player);
         if (request.equalsIgnoreCase("count")) {
             return String.valueOf(data.getRtpCount());
+        } else if (request.equalsIgnoreCase("cooldowninworld")) {
+            CooldownData cooldownData = data.getCooldowns().getOrDefault(player.getWorld(), null);
+            if (cooldownData != null)
+                return String.valueOf(cooldownData.getTime());
+            else
+                return "None";
+        } else if (request.startsWith("cooldown_")) {
+            CooldownData cooldownData = null;
+            String world_name = request.replace("cooldown_", "");
+            if (world_name.length() > 0) {
+                for (World world : Bukkit.getWorlds()) {
+                    if (world_name.equalsIgnoreCase(world.getName())) {
+                        cooldownData = data.getCooldowns().getOrDefault(player.getWorld(), null);
+                        break;
+                    }
+                }
+            }
+            if (cooldownData != null)
+                return String.valueOf(cooldownData.getTime());
+            else
+                return "None";
         }
         return null;
     }

src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/PermissionGroup.java

@@ -13,7 +13,7 @@ import java.util.Map;
 public class PermissionGroup {
 
     String groupName;
-    @Getter private HashMap<String, WorldPermissionGroup> worlds = new HashMap<>();
+    @Getter private final HashMap<String, WorldPermissionGroup> worlds = new HashMap<>();
 
     @SuppressWarnings("rawtypes")
     public PermissionGroup(Map.Entry<?, ?> fields) {

src/main/resources/placeholders.yml

@@ -1 +1,3 @@
-betterrtp_count: 'Get total amount of rtp''s done'
+betterrtp_count: 'Get total amount of rtp''s done'
+betterrtp_cooldowninworld: 'Get cooldown in current world'
+betterrtp_cooldown_<world_name>: 'Get cooldown of a specified world'