diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPlaceholderAPI.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPlaceholderAPI.java index 4958e87..fd02d98 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPlaceholderAPI.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPlaceholderAPI.java @@ -1,9 +1,16 @@ package me.SuperRonanCraft.BetterRTP.references.depends; import me.SuperRonanCraft.BetterRTP.BetterRTP; +import me.SuperRonanCraft.BetterRTP.player.rtp.RTPSetupInformation; +import me.SuperRonanCraft.BetterRTP.references.PermissionNode; +import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP; +import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP_Command; +import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP_Info; import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer; import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownData; +import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownHandler; +import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.RTPWorld; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.Bukkit; import org.bukkit.World; @@ -35,7 +42,7 @@ public class DepPlaceholderAPI extends PlaceholderExpansion { PlayerData data = HelperPlayer.getData(player); if (request.equalsIgnoreCase("count")) { return String.valueOf(data.getRtpCount()); - } else if (request.equalsIgnoreCase("cooldowninworld")) { + } else if (request.equalsIgnoreCase("cooldown")) { CooldownData cooldownData = data.getCooldowns().getOrDefault(player.getWorld(), null); if (cooldownData != null) return String.valueOf(cooldownData.getTime()); @@ -56,6 +63,23 @@ public class DepPlaceholderAPI extends PlaceholderExpansion { return String.valueOf(cooldownData.getTime()); else return "None"; + } else if (request.startsWith("rtpable_")) { + String world_name = request.replace("rtpable_", ""); + World world = null; + if (world_name.length() > 0) { + for (World _world : Bukkit.getWorlds()) { + if (world_name.equalsIgnoreCase(_world.getName())) { + world = _world; + break; + } + } + } + if (world == null) return "Invalid World"; + if (!PermissionNode.getAWorld(player, world.getName())) + return "No Permission"; + CooldownData cooldownData = HelperPlayer.getData(player).getCooldowns().getOrDefault(world, null); + //RTPWorld rtpWorld = BetterRTP.getInstance().getRTP().getPlayerWorld(new RTPSetupInformation()); + //if (cooldownData != null && BetterRTP.getInstance().getCooldowns().timeLeft(player, cooldownData, world)) } return null; } diff --git a/src/main/resources/placeholders.yml b/src/main/resources/placeholders.yml index e24706f..601646c 100644 --- a/src/main/resources/placeholders.yml +++ b/src/main/resources/placeholders.yml @@ -1,3 +1,3 @@ betterrtp_count: 'Get total amount of rtp''s done' -betterrtp_cooldowninworld: 'Get cooldown in current world' +betterrtp_cooldown: 'Get cooldown in current world' betterrtp_cooldown_: 'Get cooldown of a specified world' \ No newline at end of file