GH-253 Add configurable placeholder settings and new placeholders

buildSrc/src/main/kotlin/eternalcombat-java.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "com.eternalcode"
-version = "2.2.0"
+version = "2.2.1-SNAPSHOT"
 
 tasks.compileJava {
     options.compilerArgs = listOf("-Xlint:deprecation", "-parameters")

eternalcombat-plugin/build.gradle.kts

@@ -74,7 +74,7 @@ bukkit {
 
 tasks {
     runServer {
-        minecraftVersion("1.21.4")
+        minecraftVersion("1.21")
         downloadPlugins.url("https://github.com/retrooper/packetevents/releases/download/v2.8.0/packetevents-spigot-2.8.0.jar")
     }
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java

@@ -55,6 +55,7 @@
 import dev.rollczi.litecommands.LiteCommands;
 import dev.rollczi.litecommands.bukkit.LiteBukkitFactory;
 import dev.rollczi.litecommands.bukkit.LiteBukkitMessages;
+import dev.rollczi.litecommands.permission.PermissionResolver;
 import net.kyori.adventure.platform.AudienceProvider;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.minimessage.MiniMessage;

eternalcombat-plugin/src/main/java/com/eternalcode/combat/EternalCombatReloadCommand.java

@@ -14,7 +14,6 @@
 import org.bukkit.command.CommandSender;
 
 @Command(name = "combatlog", aliases = "combat")
-@Permission("eternalcombat.reload")
 public class EternalCombatReloadCommand {
 
     private static final Notice RELOAD_MESSAGE = BukkitNotice.builder()
@@ -31,6 +30,7 @@ public EternalCombatReloadCommand(ConfigService configService, NoticeService not
 
     @Async
     @Execute(name = "reload")
+    @Permission("eternalcombat.reload")
     void execute(@Context CommandSender sender) {
         Stopwatch stopwatch = Stopwatch.createStarted();
         this.configService.reload();

eternalcombat-plugin/src/main/java/com/eternalcode/combat/bridge/BridgeService.java

@@ -69,7 +69,7 @@ public void init(Server server) {
 
         initialize(
             "PlaceholderAPI",
-            () -> new FightTagPlaceholder(this.fightManager, server, this.plugin).register(),
+            () -> new FightTagPlaceholder(this.config.placeholder, this.fightManager, server, this.plugin).register(),
             () -> this.logger.warning("PlaceholderAPI not found; skipping placeholders.")
         );
     }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/bridge/placeholder/FightTagPlaceholder.java

@@ -1,5 +1,6 @@
 package com.eternalcode.combat.bridge.placeholder;
 
+import com.eternalcode.combat.config.implementation.PlaceholderSettings;
 import com.eternalcode.combat.fight.FightManager;
 import com.eternalcode.combat.fight.FightTag;
 import com.eternalcode.combat.util.DurationUtil;
@@ -14,12 +15,14 @@
 
 public class FightTagPlaceholder extends PlaceholderExpansion {
 
+    private static final String IDENTIFIER = "eternalcombat";
+    private final PlaceholderSettings placeholderSettings;
     private final FightManager fightManager;
     private final Server server;
     private final Plugin plugin;
-    private static final String IDENTIFIER = "eternalcombat";
 
-    public FightTagPlaceholder(FightManager fightManager, Server server, Plugin plugin) {
+    public FightTagPlaceholder(PlaceholderSettings placeholderSettings, FightManager fightManager, Server server, Plugin plugin) {
+        this.placeholderSettings = placeholderSettings;
         this.fightManager = fightManager;
         this.server = server;
         this.plugin = plugin;
@@ -30,7 +33,6 @@ public boolean canRegister() {
         return true;
     }
 
-
     @Override
     public @NotNull String getIdentifier() {
         return IDENTIFIER;
@@ -71,6 +73,16 @@ public String onRequest(OfflinePlayer player, String identifier) {
                 .map(tagger -> String.format("%.2f", tagger.getHealth()))
                 .orElse("");
         }
+        if (identifier.equals("isInCombat")) {
+            return this.getFightTag(player)
+                .map(fightTag -> "true")
+                .orElse("false");
+        }
+        if (identifier.equals("isInCombat_formatted")) {
+            return this.getFightTag(player)
+                .map(fightTag -> this.placeholderSettings.isInCombatFormattedTrue)
+                .orElse(this.placeholderSettings.isInCombatFormattedFalse);
+        }
 
         return null;
     }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/PlaceholderSettings.java

@@ -0,0 +1,10 @@
+package com.eternalcode.combat.config.implementation;
+
+import eu.okaeri.configs.OkaeriConfig;
+
+public class PlaceholderSettings extends OkaeriConfig {
+
+    public String isInCombatFormattedTrue = "In Combat";
+    public String isInCombatFormattedFalse = "Not In Combat";
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/PluginConfig.java

@@ -106,6 +106,13 @@ public class PluginConfig extends OkaeriConfig {
     })
     public CombatSettings combat = new CombatSettings();
 
+    @Comment({
+        " ",
+        "# Settings related to placeholders used in the plugin.",
+        "# Now only for isInCombat_formatted"
+    })
+    public PlaceholderSettings placeholder = new PlaceholderSettings();
+
     @Comment({
         " ",
         "# Customize the messages displayed by the plugin.",