Set saberfactions as provided

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tcoded</groupId>
     <artifactId>PlayerBountiesPlus</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <packaging>jar</packaging>
 
     <name>PlayerBountiesPlus</name>
@@ -99,6 +99,10 @@
             <id>glaremasters repo</id>
             <url>https://repo.glaremasters.me/repository/towny/</url>
         </repository>
+        <repository>
+            <id>placeholderapi</id>
+            <url>https://repo.extendedclip.com/releases/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -173,6 +177,7 @@
             <groupId>com.github.SaberLLC</groupId>
             <artifactId>Saber-Factions</artifactId>
             <version>4.1.2-STABLE</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.palmergames.bukkit.towny</groupId>
@@ -180,5 +185,11 @@
             <version>0.100.0.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>me.clip</groupId>
+            <artifactId>placeholderapi</artifactId>
+            <version>2.11.6</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/com/tcoded/playerbountiesplus/PlayerBountiesPlus.java

@@ -4,10 +4,12 @@ import com.google.common.collect.ImmutableList;
 import com.tcoded.folialib.FoliaLib;
 import com.tcoded.playerbountiesplus.command.BountyCommand;
 import com.tcoded.playerbountiesplus.command.PlayerBountiesPlusAdminCmd;
-import com.tcoded.playerbountiesplus.hook.currency.AbstractEconomyHook;
+import com.tcoded.playerbountiesplus.hook.currency.EconomyHook;
 import com.tcoded.playerbountiesplus.hook.currency.DummyEcoHook;
 import com.tcoded.playerbountiesplus.hook.currency.VaultHook;
+import com.tcoded.playerbountiesplus.hook.placeholder.PlaceholderHook;
 import com.tcoded.playerbountiesplus.hook.team.AbstractTeamHook;
+import com.tcoded.playerbountiesplus.hook.team.TeamHook;
 import com.tcoded.playerbountiesplus.listener.DeathListener;
 import com.tcoded.playerbountiesplus.manager.BountyDataManager;
 import com.tcoded.playerbountiesplus.util.LangUtil;
@@ -43,8 +45,9 @@ public final class PlayerBountiesPlus extends JavaPlugin {
     private BountyDataManager bountyDataManager;
 
     // Hooks
-    private AbstractEconomyHook ecoHook;
-    private AbstractTeamHook teamHook;
+    private EconomyHook ecoHook;
+    private TeamHook teamHook;
+    private PlaceholderHook placeholderHook;
 
     public PlayerBountiesPlus() {
         instance = this;
@@ -69,11 +72,15 @@ public final class PlayerBountiesPlus extends JavaPlugin {
         if (!applyEcoHookRegistration()) return;
 
         // Team Hooks
-        this.teamHook = AbstractTeamHook.findTeamHook(this);
+        this.teamHook = TeamHook.findTeamHook(this);
         if (this.teamHook == null) {
             getLogger().warning("There is no supported team/clan/party plugin on the server! Feel free to request support for the plugin you use on GitHub or Discord!");
         }
 
+        // Placeholder Hooks
+        this.placeholderHook = PlaceholderHook.findPlaceholderHook(this);
+        this.placeholderHook.enable();
+
         // Commands
         PluginCommand bountyCmd = this.getCommand("bounty");
         if (bountyCmd != null) {
@@ -128,16 +135,21 @@ public final class PlayerBountiesPlus extends JavaPlugin {
     @Override
     public void onDisable() {
         HandlerList.unregisterAll(this);
+        this.placeholderHook.disable();
     }
 
-    public AbstractEconomyHook getEcoHook() {
+    public EconomyHook getEcoHook() {
         return this.ecoHook;
     }
 
-    public AbstractTeamHook getTeamHook() {
+    public TeamHook getTeamHook() {
         return teamHook;
     }
 
+    public PlaceholderHook getPlaceholderHook() {
+        return placeholderHook;
+    }
+
     public BountyDataManager getBountyDataManager() {
         return bountyDataManager;
     }
@@ -186,14 +198,14 @@ public final class PlayerBountiesPlus extends JavaPlugin {
         boolean ecoPresent = vaultEcoHook.init();
 
         // Register or fallback
-        if (ecoPresent) servicesManager.register(AbstractEconomyHook.class, vaultEcoHook, this, ServicePriority.Low);
-        else servicesManager.register(AbstractEconomyHook.class, new DummyEcoHook(), this, ServicePriority.Lowest);
+        if (ecoPresent) servicesManager.register(EconomyHook.class, vaultEcoHook, this, ServicePriority.Low);
+        else servicesManager.register(EconomyHook.class, new DummyEcoHook(), this, ServicePriority.Lowest);
     }
 
     public boolean applyEcoHookRegistration() {
         // Get economy hook
         ServicesManager servicesManager = getServer().getServicesManager();
-        RegisteredServiceProvider<AbstractEconomyHook> ecoHookProvider = servicesManager.getRegistration(AbstractEconomyHook.class);
+        RegisteredServiceProvider<EconomyHook> ecoHookProvider = servicesManager.getRegistration(EconomyHook.class);
         if (ecoHookProvider == null) {
             getLogger().severe("No economy hook is present! Aborting startup!");
             return false;

src/main/java/com/tcoded/playerbountiesplus/command/bounty/BountyCheckCmd.java

@@ -1,6 +1,7 @@
 package com.tcoded.playerbountiesplus.command.bounty;
 
 import com.tcoded.playerbountiesplus.PlayerBountiesPlus;
+import com.tcoded.playerbountiesplus.manager.BountyDataManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -26,14 +27,16 @@ public class BountyCheckCmd {
 
         UUID playerUUID = target.getUniqueId();
 
-        Integer amount = plugin.getBountyDataManager().getBounties().get(playerUUID);
+        BountyDataManager bountyDataManager = plugin.getBountyDataManager();
+        boolean hasBounty = bountyDataManager.hasBounty(playerUUID);
 
-        if (amount != null && amount > 0) {
+        if (hasBounty) {
             // Confirmation
+            int bounty = bountyDataManager.getBounty(playerUUID);
             sender.sendMessage(
                     plugin.getLang().getColored("command.bounty.check.bounty-found")
                             .replace("{target}", target.getName())
-                            .replace("{bounty}", amount.toString())
+                            .replace("{bounty}", Integer.toString(bounty))
             );
         } else {
             sender.sendMessage(

src/main/java/com/tcoded/playerbountiesplus/command/bounty/BountySetCmd.java

@@ -1,12 +1,12 @@
 package com.tcoded.playerbountiesplus.command.bounty;
 
 import com.tcoded.playerbountiesplus.PlayerBountiesPlus;
+import com.tcoded.playerbountiesplus.manager.BountyDataManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class BountySetCmd {
 
@@ -17,7 +17,7 @@ public class BountySetCmd {
         }
 
         String playerNameArg = args[1];
-        int amount;
+        float amount;
         try {
             amount = Integer.parseInt(args[2]);
         } catch (NumberFormatException ex) {
@@ -61,7 +61,7 @@ public class BountySetCmd {
         }
 
         // Apply bounty multiplier
-        amount *= plugin.getConfig().getDouble("bounty-multiplier", 1.0);
+        amount *= (float) plugin.getConfig().getDouble("bounty-multiplier", 1.0);
 
         // Sanity check final amount
         if (amount <= 0) {
@@ -72,10 +72,10 @@ public class BountySetCmd {
         UUID playerUUID = target.getUniqueId();
 
         // Calculate total bounty including previous bounties
-        ConcurrentHashMap<UUID, Integer> bounties = plugin.getBountyDataManager().getBounties();
-        Integer bountyAlreadyPresent = bounties.getOrDefault(playerUUID, 0);
-        int totalBounty = amount + bountyAlreadyPresent;
-        bounties.put(playerUUID, totalBounty);
+        BountyDataManager bountyDataManager = plugin.getBountyDataManager();
+        int bountyAlreadyPresent = bountyDataManager.getBounty(playerUUID);
+        int totalBounty = ((int) amount) + bountyAlreadyPresent;
+        bountyDataManager.setBounty(playerUUID, totalBounty);
 
         // Confirmation
         sender.sendMessage(
@@ -104,7 +104,7 @@ public class BountySetCmd {
             );
         }
 
-        plugin.getBountyDataManager().saveBountiesAsync();
+        bountyDataManager.saveBountiesAsync();
 
         return true;
     }

src/main/java/com/tcoded/playerbountiesplus/hook/currency/AbstractEconomyHook.java

@@ -1,15 +0,0 @@
-package com.tcoded.playerbountiesplus.hook.currency;
-
-import org.bukkit.entity.Player;
-
-public abstract class AbstractEconomyHook {
-
-    public abstract boolean isValid();
-
-    public abstract void giveEco(Player player, double amount);
-
-    public abstract boolean takeEco(Player player, double amount);
-
-    public abstract boolean takeEco(Player player, double amount, boolean force);
-
-}

src/main/java/com/tcoded/playerbountiesplus/hook/currency/DummyEcoHook.java

@@ -2,7 +2,7 @@ package com.tcoded.playerbountiesplus.hook.currency;
 
 import org.bukkit.entity.Player;
 
-public class DummyEcoHook extends AbstractEconomyHook {
+public class DummyEcoHook implements EconomyHook {
 
     @Override
     public boolean isValid() {

src/main/java/com/tcoded/playerbountiesplus/hook/currency/EconomyHook.java

@@ -0,0 +1,15 @@
+package com.tcoded.playerbountiesplus.hook.currency;
+
+import org.bukkit.entity.Player;
+
+public interface EconomyHook {
+
+    boolean isValid();
+
+    void giveEco(Player player, double amount);
+
+    boolean takeEco(Player player, double amount);
+
+    boolean takeEco(Player player, double amount, boolean force);
+
+}

src/main/java/com/tcoded/playerbountiesplus/hook/currency/VaultHook.java

@@ -6,7 +6,7 @@ import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
-public class VaultHook extends AbstractEconomyHook {
+public class VaultHook implements EconomyHook {
 
     private final PlayerBountiesPlus plugin;
 

src/main/java/com/tcoded/playerbountiesplus/hook/placeholder/DummyPlaceholderHook.java

@@ -0,0 +1,15 @@
+package com.tcoded.playerbountiesplus.hook.placeholder;
+
+public class DummyPlaceholderHook implements PlaceholderHook {
+
+    @Override
+    public void enable() {
+
+    }
+
+    @Override
+    public void disable() {
+
+    }
+
+}

src/main/java/com/tcoded/playerbountiesplus/hook/placeholder/PlaceholderAPIHook.java

@@ -0,0 +1,61 @@
+package com.tcoded.playerbountiesplus.hook.placeholder;
+
+import com.tcoded.playerbountiesplus.PlayerBountiesPlus;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class PlaceholderAPIHook extends PlaceholderExpansion implements PlaceholderHook {
+
+    private final PlayerBountiesPlus pbpPlugin;
+
+    public PlaceholderAPIHook(PlayerBountiesPlus pbpPlugin, Plugin papiPlugin) {
+        this.pbpPlugin = pbpPlugin;
+        if (!(papiPlugin instanceof PlaceholderAPIPlugin)) {
+            throw new IllegalArgumentException("Plugin is not PlaceholderAPI");
+        }
+    }
+
+    @Override
+    public @NotNull String getIdentifier() {
+        return pbpPlugin.getName().toLowerCase();
+    }
+
+    @Override
+    public @NotNull String getAuthor() {
+        return pbpPlugin.getDescription().getAuthors().get(0);
+    }
+
+    @Override
+    public @NotNull String getVersion() {
+        return pbpPlugin.getDescription().getVersion();
+    }
+
+    @Override
+    public boolean persist() {
+        return true;
+    }
+
+    @Override
+    public void enable() {
+        this.register();
+    }
+
+    @Override
+    public void disable() {
+        this.unregister();
+    }
+
+    @Override
+    public @Nullable String onRequest(OfflinePlayer player, @NotNull String params) {
+        if (params.equals("bounty")) {
+            return String.valueOf(pbpPlugin.getBountyDataManager().getBounty(player.getUniqueId()));
+        }
+
+        return "INVALID-OPTION";
+    }
+
+}

src/main/java/com/tcoded/playerbountiesplus/hook/placeholder/PlaceholderHook.java

@@ -0,0 +1,27 @@
+package com.tcoded.playerbountiesplus.hook.placeholder;
+
+import com.tcoded.playerbountiesplus.PlayerBountiesPlus;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
+import org.jetbrains.annotations.NotNull;
+
+public interface PlaceholderHook {
+
+    @NotNull
+    static PlaceholderHook findPlaceholderHook(PlayerBountiesPlus plugin) {
+        PluginManager pluginManager = plugin.getServer().getPluginManager();
+
+        Plugin papiPlugin = pluginManager.getPlugin("PlaceholderAPI");
+        if (papiPlugin != null) {
+            return new PlaceholderAPIHook(plugin, papiPlugin);
+        }
+
+        plugin.getLogger().warning("PlaceholderAPI not found, placeholders will be unavailable.");
+        return new DummyPlaceholderHook();
+    }
+
+    void enable();
+
+    void disable();
+
+}

src/main/java/com/tcoded/playerbountiesplus/hook/team/AbstractTeamHook.java

@@ -1,14 +1,12 @@
 package com.tcoded.playerbountiesplus.hook.team;
 
 import com.tcoded.playerbountiesplus.PlayerBountiesPlus;
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.List;
 
-public abstract class AbstractTeamHook {
+public abstract class AbstractTeamHook implements TeamHook {
 
     protected PlayerBountiesPlus plugin;
     protected JavaPlugin teamPlugin;
@@ -18,66 +16,23 @@ public abstract class AbstractTeamHook {
         this.teamPlugin = (JavaPlugin) teamPlugin;
     }
 
-    public static AbstractTeamHook findTeamHook(PlayerBountiesPlus plugin) {
-        PluginManager pluginManager = plugin.getServer().getPluginManager();
-
-        // loving11ish - ClansLite - https://www.spigotmc.org/resources/clanslite-1-19-4-support.97163/
-        Plugin clansLitePlugin = pluginManager.getPlugin("ClansLite");
-        if (clansLitePlugin != null && clansLitePlugin.isEnabled()) {
-            return new ClansLiteHook(plugin, clansLitePlugin);
-        }
-
-        // AlessioDP - Parties - https://www.spigotmc.org/resources/parties-an-advanced-parties-manager.3709/
-        Plugin partiesPlugin = pluginManager.getPlugin("Parties");
-        if (partiesPlugin != null && partiesPlugin.isEnabled()) {
-            return new AlessioPartiesHook(plugin, partiesPlugin);
-        }
-
-        // booksaw - BetterTeams - https://www.spigotmc.org/resources/better-teams.17129/
-        Plugin betterTeamsPlugin = pluginManager.getPlugin("BetterTeams");
-        if (betterTeamsPlugin != null && betterTeamsPlugin.isEnabled()) {
-            return new BetterTeamsHook(plugin, betterTeamsPlugin);
-        }
-
-        // RoinujNosde - SimpleClans - https://www.spigotmc.org/resources/simpleclans.71242/
-        Plugin simpleClansPlugin = pluginManager.getPlugin("SimpleClans");
-        if (simpleClansPlugin != null && simpleClansPlugin.isEnabled()) {
-            return new SimpleClansHook(plugin, simpleClansPlugin);
-        }
-
-        // SaberLLC - Factions (SaberFactions) - https://www.spigotmc.org/resources/simpleclans.71242/
-        Plugin saberFactionsPlugin = pluginManager.getPlugin("Factions");
-        if (saberFactionsPlugin != null &&
-                saberFactionsPlugin.getDescription().getMain().equals("com.massivecraft.factions.FactionsPlugin") &&
-                saberFactionsPlugin.isEnabled()) {
-            return new SaberFactionsHook(plugin, saberFactionsPlugin);
-        }
-
-        // LlmDl - Towny - https://www.spigotmc.org/resources/towny-advanced.72694/
-        Plugin townyPlugin = pluginManager.getPlugin("Towny");
-        if (townyPlugin != null && townyPlugin.isEnabled()) {
-            return new TownyHook(plugin, simpleClansPlugin);
-        }
-
-        return null;
-    }
-
+    @Override
     public String getPluginName() {
         return this.teamPlugin.getName();
     }
 
+    @Override
     public String getAuthor() {
         List<String> authors = this.teamPlugin.getDescription().getAuthors();
         if (authors.isEmpty()) return "N/A";
         return authors.get(0);
     }
 
+    @Override
     public String[] getAuthors() {
         List<String> authors = this.teamPlugin.getDescription().getAuthors();
         if (authors.isEmpty()) return new String[0];
         return authors.toArray(new String[0]);
     }
 
-    public abstract boolean isFriendly(Player player1, Player player2);
-
 }

src/main/java/com/tcoded/playerbountiesplus/hook/team/TeamHook.java

@@ -0,0 +1,62 @@
+package com.tcoded.playerbountiesplus.hook.team;
+
+import com.tcoded.playerbountiesplus.PlayerBountiesPlus;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
+
+public interface TeamHook {
+
+    static AbstractTeamHook findTeamHook(PlayerBountiesPlus plugin) {
+        PluginManager pluginManager = plugin.getServer().getPluginManager();
+
+        // loving11ish - ClansLite - https://www.spigotmc.org/resources/clanslite-1-19-4-support.97163/
+        Plugin clansLitePlugin = pluginManager.getPlugin("ClansLite");
+        if (clansLitePlugin != null && clansLitePlugin.isEnabled()) {
+            return new ClansLiteHook(plugin, clansLitePlugin);
+        }
+
+        // AlessioDP - Parties - https://www.spigotmc.org/resources/parties-an-advanced-parties-manager.3709/
+        Plugin partiesPlugin = pluginManager.getPlugin("Parties");
+        if (partiesPlugin != null && partiesPlugin.isEnabled()) {
+            return new AlessioPartiesHook(plugin, partiesPlugin);
+        }
+
+        // booksaw - BetterTeams - https://www.spigotmc.org/resources/better-teams.17129/
+        Plugin betterTeamsPlugin = pluginManager.getPlugin("BetterTeams");
+        if (betterTeamsPlugin != null && betterTeamsPlugin.isEnabled()) {
+            return new BetterTeamsHook(plugin, betterTeamsPlugin);
+        }
+
+        // RoinujNosde - SimpleClans - https://www.spigotmc.org/resources/simpleclans.71242/
+        Plugin simpleClansPlugin = pluginManager.getPlugin("SimpleClans");
+        if (simpleClansPlugin != null && simpleClansPlugin.isEnabled()) {
+            return new SimpleClansHook(plugin, simpleClansPlugin);
+        }
+
+        // SaberLLC - Factions (SaberFactions) - https://www.spigotmc.org/resources/simpleclans.71242/
+        Plugin saberFactionsPlugin = pluginManager.getPlugin("Factions");
+        if (saberFactionsPlugin != null &&
+                saberFactionsPlugin.getDescription().getMain().equals("com.massivecraft.factions.FactionsPlugin") &&
+                saberFactionsPlugin.isEnabled()) {
+            return new SaberFactionsHook(plugin, saberFactionsPlugin);
+        }
+
+        // LlmDl - Towny - https://www.spigotmc.org/resources/towny-advanced.72694/
+        Plugin townyPlugin = pluginManager.getPlugin("Towny");
+        if (townyPlugin != null && townyPlugin.isEnabled()) {
+            return new TownyHook(plugin, simpleClansPlugin);
+        }
+
+        return null;
+    }
+
+    String getPluginName();
+
+    String getAuthor();
+
+    String[] getAuthors();
+
+    boolean isFriendly(Player player1, Player player2);
+
+}

src/main/java/com/tcoded/playerbountiesplus/listener/DeathListener.java

@@ -1,7 +1,8 @@
 package com.tcoded.playerbountiesplus.listener;
 
 import com.tcoded.playerbountiesplus.PlayerBountiesPlus;
-import com.tcoded.playerbountiesplus.hook.team.AbstractTeamHook;
+import com.tcoded.playerbountiesplus.hook.team.TeamHook;
+import com.tcoded.playerbountiesplus.manager.BountyDataManager;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -9,11 +10,10 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
 
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class DeathListener implements Listener {
 
-    private PlayerBountiesPlus plugin;
+    private final PlayerBountiesPlus plugin;
 
     public DeathListener(PlayerBountiesPlus plugin) {
         this.plugin = plugin;
@@ -25,17 +25,18 @@ public class DeathListener implements Listener {
         Player killer = victim.getKiller();
 
         if (killer != null) {
-            ConcurrentHashMap<UUID, Integer> bounties = this.plugin.getBountyDataManager().getBounties();
+            BountyDataManager bountyDataManager = this.plugin.getBountyDataManager();
             UUID victimId = victim.getUniqueId();
-            Integer bounty = bounties.get(victimId);
 
             // Bounty check
-            if (bounty == null || bounty == 0) {
+            if (bountyDataManager.hasBounty(victimId)) {
                 return;
             }
 
+            int bounty = bountyDataManager.getBounty(victimId);
+
             // Clan check
-            AbstractTeamHook teamHook = this.plugin.getTeamHook();
+            TeamHook teamHook = this.plugin.getTeamHook();
             if (teamHook != null && teamHook.isFriendly(killer, victim)) {
                 killer.sendMessage(plugin.getLang().getColored("death.same-team"));
                 return;
@@ -64,13 +65,13 @@ public class DeathListener implements Listener {
                         plugin.getLang().getColored("death.announce-claimed")
                                 .replace("{killer}", killer.getName())
                                 .replace("{victim}", victim.getName())
-                                .replace("{bounty}", bounty.toString())
+                                .replace("{bounty}", String.valueOf(bounty))
                 );
             }
 
             // Remove bounty
-            bounties.remove(victimId);
-            this.plugin.getBountyDataManager().saveBountiesAsync();
+            bountyDataManager.removeBounty(victimId);
+            bountyDataManager.saveBountiesAsync();
         }
     }
 

src/main/java/com/tcoded/playerbountiesplus/manager/BountyDataManager.java

@@ -50,6 +50,22 @@ public class BountyDataManager {
         return this.bounties;
     }
 
+    public boolean hasBounty(UUID player) {
+        return this.bounties.containsKey(player) && this.bounties.get(player) > 0;
+    }
+
+    public void setBounty(UUID player, int amount) {
+        this.bounties.put(player, amount);
+    }
+
+    public int getBounty(UUID player) {
+        return this.bounties.getOrDefault(player, 0);
+    }
+
+    public void removeBounty(UUID player) {
+        this.bounties.remove(player);
+    }
+
     public void saveBounties() {
         synchronized (this.savingFileLock) {
             // Clear existing
@@ -92,4 +108,5 @@ public class BountyDataManager {
             }
         });
     }
+
 }