GH-266 New features for Trident and Pearls

eternalcombat-api/src/main/java/com/eternalcode/combat/EternalCombatApi.java

@@ -4,7 +4,7 @@
 import com.eternalcode.combat.fight.FightManager;
 import com.eternalcode.combat.fight.drop.DropService;
 import com.eternalcode.combat.fight.effect.FightEffectService;
-import com.eternalcode.combat.fight.pearl.FightPearlService;
+import com.eternalcode.combat.fight.pearl.PearlService;
 import com.eternalcode.combat.region.RegionProvider;
 import com.eternalcode.combat.fight.tagout.FightTagOutService;
 
@@ -14,7 +14,7 @@ public interface EternalCombatApi {
 
     RegionProvider getRegionProvider();
 
-    FightPearlService getFightPearlService();
+    PearlService getFightPearlService();
 
     FightTagOutService getFightTagOutService();
 

eternalcombat-api/src/main/java/com/eternalcode/combat/fight/event/CauseOfTag.java

@@ -23,6 +23,17 @@ public enum CauseOfTag {
      */
     CRYSTAL,
 
+    /**
+     * Trident usage extending combat tag.
+     */
+    TRIDENT,
+
+    /**
+     * Ender pearl usage extending combat tag.
+     */
+    ENDER_PEARL,
+
+
     /**
      * A custom cause, typically defined by external plugins or systems, applied the combat tag.
      */

eternalcombat-api/src/main/java/com/eternalcode/combat/fight/pearl/FightPearlService.java → eternalcombat-api/src/main/java/com/eternalcode/combat/fight/pearl/PearlService.java

@@ -1,16 +1,16 @@
 package com.eternalcode.combat.fight.pearl;
 
 import java.time.Duration;
-import java.time.Instant;
 import java.util.UUID;
+import org.bukkit.entity.Player;
 
-public interface FightPearlService {
+public interface PearlService {
 
-    Instant getDelay(UUID uuid);
+    boolean shouldCancelEvent(UUID playerId);
 
     Duration getRemainingDelay(UUID uuid);
 
     boolean hasDelay(UUID uuid);
 
-    void markDelay(UUID uuid);
+    void handleDelay(Player uuid);
 }

eternalcombat-api/src/main/java/com/eternalcode/combat/fight/trident/TridentService.java

@@ -0,0 +1,35 @@
+package com.eternalcode.combat.fight.trident;
+
+import java.time.Duration;
+import java.util.UUID;
+import org.bukkit.entity.Player;
+
+public interface TridentService {
+
+    /**
+     * returns remaining delay for the player to use trident again
+     * @param uuid unique id of the player
+     * @return remaining duration left to use trident again by the player or zero
+     */
+    Duration getRemainingDelay(UUID uuid);
+
+    /**
+     * checks if player still has delay left to use trident
+     * @param uuid unique id of the player
+     * @return true if user still has cooldown left to use trident
+     */
+    boolean hasDelay(UUID uuid);
+
+    /**
+     * marks start of the delay for the user
+     * @param uuid unique id of the player
+     */
+    void markDelay(UUID uuid);
+
+    /**
+     * handles the trident cooldown for the player, should be called when player uses riptide in combat
+     * @param player the player who used riptide in combat needed to apply cooldown to item
+     */
+    void handleTridentDelay(Player player);
+
+}

eternalcombat-plugin/build.gradle.kts

@@ -1,6 +1,6 @@
-import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
+
 import io.papermc.hangarpublishplugin.model.Platforms
-import org.gradle.kotlin.dsl.shadowJar
+import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
 
 plugins {
     `eternalcombat-java`
@@ -93,7 +93,7 @@ bukkit {
 
 tasks {
     runServer {
-        minecraftVersion("1.21.10")
+        minecraftVersion("1.21.11")
         downloadPlugins.modrinth("WorldEdit", Versions.WORLDEDIT)
         downloadPlugins.modrinth("PacketEvents", "${Versions.PACKETEVENTS}+spigot")
         downloadPlugins.modrinth("WorldGuard", Versions.WORLDGUARD)

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

@@ -18,7 +18,10 @@
 import com.eternalcode.combat.fight.firework.FireworkController;
 import com.eternalcode.combat.fight.knockback.KnockbackService;
 import com.eternalcode.combat.fight.tagout.FightTagOutService;
-import com.eternalcode.combat.fight.pearl.FightPearlService;
+import com.eternalcode.combat.fight.pearl.PearlService;
+import com.eternalcode.combat.fight.trident.TridentController;
+import com.eternalcode.combat.fight.trident.TridentService;
+import com.eternalcode.combat.fight.trident.TridentServiceImpl;
 import com.eternalcode.combat.handler.InvalidUsageHandlerImpl;
 import com.eternalcode.combat.handler.MissingPermissionHandlerImpl;
 import com.eternalcode.combat.config.ConfigService;
@@ -40,8 +43,8 @@
 import com.eternalcode.combat.fight.effect.FightEffectServiceImpl;
 import com.eternalcode.combat.fight.logout.LogoutController;
 import com.eternalcode.combat.fight.logout.LogoutService;
-import com.eternalcode.combat.fight.pearl.FightPearlController;
-import com.eternalcode.combat.fight.pearl.FightPearlServiceImpl;
+import com.eternalcode.combat.fight.pearl.PearlController;
+import com.eternalcode.combat.fight.pearl.PearlServiceImpl;
 import com.eternalcode.combat.fight.tagout.FightTagOutController;
 import com.eternalcode.combat.fight.tagout.FightTagOutServiceImpl;
 import com.eternalcode.combat.fight.tagout.FightTagOutCommand;
@@ -80,7 +83,8 @@ public final class CombatPlugin extends JavaPlugin implements EternalCombatApi {
     private static final int BSTATS_METRICS_ID = 17803;
 
     private FightManager fightManager;
-    private FightPearlService fightPearlService;
+    private PearlService pearlService;
+    private TridentService tridentService;
     private FightTagOutService fightTagOutService;
     private FightEffectService fightEffectService;
 
@@ -108,7 +112,8 @@ public void onEnable() {
         MinecraftScheduler scheduler = CombatSchedulerAdapter.getAdaptiveScheduler(this);
 
         this.fightManager = new FightManagerImpl(eventManager);
-        this.fightPearlService = new FightPearlServiceImpl(pluginConfig.pearl);
+        this.pearlService = new PearlServiceImpl(this.fightManager, pluginConfig, scheduler);
+        this.tridentService = new TridentServiceImpl(this.fightManager, pluginConfig);
         this.fightTagOutService = new FightTagOutServiceImpl();
         this.fightEffectService = new FightEffectServiceImpl();
 
@@ -179,7 +184,8 @@ public void onEnable() {
             new FightBypassPermissionController(server, pluginConfig),
             new FightBypassCreativeController(server, pluginConfig),
             new FightActionBlockerController(this.fightManager, noticeService, pluginConfig, server),
-            new FightPearlController(pluginConfig.pearl, noticeService, this.fightManager, this.fightPearlService),
+            new PearlController(pluginConfig, this.pearlService, noticeService),
+            new TridentController(pluginConfig, noticeService, this.fightManager, this.tridentService),
             new UpdaterNotificationController(updaterService, pluginConfig, this.audienceProvider, miniMessage),
             new KnockbackRegionController(noticeService, this.regionProvider, this.fightManager, knockbackService, server),
             new FightEffectController(pluginConfig.effect, this.fightEffectService, this.fightManager, server),
@@ -237,8 +243,8 @@ public RegionProvider getRegionProvider() {
     }
 
     @Override
-    public FightPearlService getFightPearlService() {
-        return this.fightPearlService;
+    public PearlService getFightPearlService() {
+        return this.pearlService;
     }
 
     @Override

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

@@ -4,7 +4,8 @@
 import com.eternalcode.combat.fight.drop.DropSettings;
 import com.eternalcode.combat.fight.effect.FightEffectSettings;
 import com.eternalcode.combat.fight.knockback.KnockbackSettings;
-import com.eternalcode.combat.fight.pearl.FightPearlSettings;
+import com.eternalcode.combat.fight.pearl.PearlSettings;
+import com.eternalcode.combat.fight.trident.TridentSettings;
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
 import java.time.Duration;
@@ -33,7 +34,14 @@ public class PluginConfig extends OkaeriConfig {
         "# Settings related to Ender Pearls.",
         "# Configure cooldowns, restrictions, and other behaviors for Ender Pearls during combat."
     })
-    public FightPearlSettings pearl = new FightPearlSettings();
+    public PearlSettings pearl = new PearlSettings();
+
+    @Comment({
+        " ",
+        "# Settings related to Trident",
+        "# Configure cooldowns, restrictions, and other behaviors for Trident during combat."
+    })
+    public TridentSettings trident = new TridentSettings();
 
     @Comment({
         " ",