From d6dac94e9aefa889bbd36297b395f7d53a1e18e1 Mon Sep 17 00:00:00 2001 From: RonanCraft Date: Mon, 10 Oct 2022 12:17:54 -0400 Subject: [PATCH] cooldown placeholders --- pom.xml | 2 +- .../player/rtp/RTPPluginValidation.java | 22 +---------------- .../references/depends/DepPlaceholderAPI.java | 24 +++++++++++++++++++ .../references/rtpinfo/PermissionGroup.java | 2 +- src/main/resources/placeholders.yml | 4 +++- 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index dfac945..b7c7d82 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ me.SuperRonanCraft BetterRTP jar - 3.4.5-DEV + 3.4.5 1.8 diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java index 5d42302..0899e1a 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java +++ b/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 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 me.SuperRonanCraft.BetterRTP.references.depends.regionPlugins.REGIONPLUGINS; import org.bukkit.Location; public class RTPPluginValidation { 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 c33c1cc..4958e87 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPlaceholderAPI.java +++ b/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; } diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/PermissionGroup.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/PermissionGroup.java index 194b631..7cec2e5 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/PermissionGroup.java +++ b/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 worlds = new HashMap<>(); + @Getter private final HashMap worlds = new HashMap<>(); @SuppressWarnings("rawtypes") public PermissionGroup(Map.Entry fields) { diff --git a/src/main/resources/placeholders.yml b/src/main/resources/placeholders.yml index 0eaa7ae..e24706f 100644 --- a/src/main/resources/placeholders.yml +++ b/src/main/resources/placeholders.yml @@ -1 +1,3 @@ -betterrtp_count: 'Get total amount of rtp''s done' \ No newline at end of file +betterrtp_count: 'Get total amount of rtp''s done' +betterrtp_cooldowninworld: 'Get cooldown in current world' +betterrtp_cooldown_: 'Get cooldown of a specified world' \ No newline at end of file