McScrims-Network/GameModes-SpeedHG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup ability context

Browse Source
This commit is contained in:
Laurin
2025-12-01 19:45:49 +01:00
parent 7634694b2e
commit ac185e35ce
5 changed files with 147 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/kotlin/club/mcscrims/speedhg/ability/AbilityContext.kt
View File

@@ -12,47 +12,64 @@ class AbilityContext(
key: String,
requiredHits: Int? = null,
cooldownSeconds: Int? = null
): AbilityResult {
if (cooldownSeconds != null && cooldownManager.isOnCooldown(player, key)) {
val remaining = cooldownManager.getRemainingSeconds(player, key)
return AbilityResult.onCooldown(remaining)
): AbilityResult
{
if ( cooldownSeconds != null && cooldownManager.isOnCooldown( player, key ))
{
val remaining = cooldownManager.getRemainingSeconds( player, key )
return AbilityResult.onCooldown( remaining )
}
if (requiredHits != null && !hitCounterManager.hasReachedThreshold(player, key, requiredHits)) {
val missing = hitCounterManager.getRemainingHits(player, key, requiredHits)
return AbilityResult.insufficientHits(missing)
if ( requiredHits != null && !hitCounterManager.hasReachedThreshold( player, key, requiredHits ))
{
val missing = hitCounterManager.getRemainingHits( player, key, requiredHits )
return AbilityResult.insufficientHits( missing )
}
if (requiredHits != null) {
hitCounterManager.resetHits(player, key)
}
if ( requiredHits != null )
hitCounterManager.resetHits( player, key )
if (cooldownSeconds != null) {
cooldownManager.startCooldown(player, key, cooldownSeconds)
}
if ( cooldownSeconds != null )
cooldownManager.startCooldown( player, key, cooldownSeconds )
return AbilityResult.success()
}
fun incrementHit(player: Player, key: String): Int {
return hitCounterManager.incrementHit(player, key)
fun incrementHit(
player: Player,
key: String
): Int
{
return hitCounterManager.incrementHit( player, key )
}
fun getHits(player: Player, key: String): Int {
return hitCounterManager.getHits(player, key)
fun getHits(
player: Player,
key: String
): Int
{
return hitCounterManager.getHits( player, key )
}
fun getRemainingCooldown(player: Player, key: String): Double {
return cooldownManager.getRemainingSeconds(player, key)
fun getRemainingCooldown(
player: Player,
key: String
): Double
{
return cooldownManager.getRemainingSeconds( player, key )
}
fun clearPlayerData(player: Player) {
cooldownManager.clearAllCooldowns(player)
hitCounterManager.clearAllHits(player)
fun clearPlayerData(
player: Player
) {
cooldownManager.clearAllCooldowns( player )
hitCounterManager.clearAllHits( player )
}
fun clearAll() {
fun clearAll()
{
cooldownManager.clearAll()
hitCounterManager.clearAll()
}
}

35
src/main/kotlin/club/mcscrims/speedhg/ability/AbilityHitListener.kt
View File

@@ -1,22 +1,27 @@
package club.mcscrims.speedhg.ability
import club.mcscrims.speedhg.SpeedHG
import org.bukkit.entity.Player
import org.bukkit.event.EventHandler
import org.bukkit.event.Listener
import org.bukkit.event.entity.EntityDamageByEntityEvent
class AbilityHitListener(private val abilityContext: AbilityContext) : Listener {
class AbilityHitListener(
private val plugin: SpeedHG,
private val abilityContext: AbilityContext
) : Listener {
@EventHandler
fun onEntityDamage(event: EntityDamageByEntityEvent) {
fun onEntityDamage(
event: EntityDamageByEntityEvent
) {
val damager = event.damager
val victim = event.entity
if (damager !is Player || victim !is Player) {
return
}
if ( damager !is Player || victim !is Player )
return
val hitCount = abilityContext.incrementHit(damager, "melee_hit")
val hitCount = abilityContext.incrementHit( damager, "melee_hit" )
val result = abilityContext.canUseAbility(
player = damager,
@@ -25,12 +30,18 @@ class AbilityHitListener(private val abilityContext: AbilityContext) : Listener
cooldownSeconds = 10
)
if (result.success) {
damager.sendMessage("§aAbility activated! You hit ${victim.name}")
} else if (result.missingHits > 0) {
damager.sendMessage("§e${result.missingHits} more hit(s) needed (Current: ${hitCount})")
} else if (result.remainingCooldown > 0) {
damager.sendMessage("§cAbility on cooldown: ${String.format("%.1f", result.remainingCooldown)}s remaining")
if ( result.success )
{
plugin.chatManager.sendMessage( damager, "ability.activated", "{player}" to victim.name )
}
else if ( result.missingHits > 0 )
{
plugin.chatManager.sendMessage( damager, "ability.more_hits", "{current}" to hitCount.toString(), "{needed}" to result.missingHits.toString() )
}
else if ( result.remainingCooldown > 0 )
{
plugin.chatManager.sendMessage( damager, "ability.cooldown", "{cooldown}" to result.remainingCooldown.toString() )
}
}
}

15
src/main/kotlin/club/mcscrims/speedhg/ability/AbilityResult.kt
View File

@@ -6,13 +6,16 @@ data class AbilityResult(
val remainingCooldown: Double = 0.0,
val missingHits: Int = 0
) {
companion object {
fun success(): AbilityResult = AbilityResult(true, null)
companion object
{
fun onCooldown(remaining: Double): AbilityResult =
AbilityResult(false, "Ability is on cooldown", remainingCooldown = remaining)
fun success(): AbilityResult = AbilityResult( true, null )
fun onCooldown( remaining: Double ): AbilityResult =
AbilityResult( false, "Ability is on cooldown", remainingCooldown = remaining )
fun insufficientHits( missing: Int ): AbilityResult =
AbilityResult( false, "Not enough hits", missingHits = missing )
fun insufficientHits(missing: Int): AbilityResult =
AbilityResult(false, "Not enough hits", missingHits = missing)
}
}

52
src/main/kotlin/club/mcscrims/speedhg/ability/CooldownManager.kt
View File

@@ -8,43 +8,61 @@ class CooldownManager {
private val cooldowns = ConcurrentHashMap<UUID, ConcurrentHashMap<String, Long>>()
fun startCooldown(player: Player, key: String, seconds: Int) {
val expiryTime = System.currentTimeMillis() + (seconds * 1000L)
cooldowns.computeIfAbsent(player.uniqueId) { ConcurrentHashMap() }[key] = expiryTime
fun startCooldown(
player: Player,
key: String,
seconds: Int
) {
val expiryTime = System.currentTimeMillis() + ( seconds * 1000L )
cooldowns.computeIfAbsent( player.uniqueId ) { ConcurrentHashMap() }[ key ] = expiryTime
}
fun isOnCooldown(player: Player, key: String): Boolean {
fun isOnCooldown(
player: Player,
key: String
): Boolean
{
val playerCooldowns = cooldowns[player.uniqueId] ?: return false
val expiryTime = playerCooldowns[key] ?: return false
if (System.currentTimeMillis() >= expiryTime) {
playerCooldowns.remove(key)
if (playerCooldowns.isEmpty()) {
cooldowns.remove(player.uniqueId)
}
if ( System.currentTimeMillis() >= expiryTime )
{
playerCooldowns.remove( key )
if ( playerCooldowns.isEmpty() ) cooldowns.remove( player.uniqueId )
return false
}
return true
}
fun getRemainingSeconds(player: Player, key: String): Double {
fun getRemainingSeconds(
player: Player,
key: String
): Double
{
val playerCooldowns = cooldowns[player.uniqueId] ?: return 0.0
val expiryTime = playerCooldowns[key] ?: return 0.0
val remaining = (expiryTime - System.currentTimeMillis()) / 1000.0
return if (remaining > 0) remaining else 0.0
val remaining = ( expiryTime - System.currentTimeMillis() ) / 1000.0
return if ( remaining > 0 ) remaining else 0.0
}
fun clearCooldown(player: Player, key: String) {
cooldowns[player.uniqueId]?.remove(key)
fun clearCooldown(
player: Player,
key: String
) {
cooldowns[player.uniqueId]?.remove( key )
}
fun clearAllCooldowns(player: Player) {
cooldowns.remove(player.uniqueId)
fun clearAllCooldowns(
player: Player
) {
cooldowns.remove( player.uniqueId )
}
fun clearAll() {
fun clearAll()
{
cooldowns.clear()
}
}

55
src/main/kotlin/club/mcscrims/speedhg/ability/HitCounterManager.kt
View File

@@ -8,34 +8,59 @@ class HitCounterManager {
private val hitCounts = ConcurrentHashMap<UUID, ConcurrentHashMap<String, Int>>()
fun incrementHit(player: Player, key: String): Int {
val playerHits = hitCounts.computeIfAbsent(player.uniqueId) { ConcurrentHashMap() }
val newCount = playerHits.compute(key) { _, current -> (current ?: 0) + 1 } ?: 1
fun incrementHit(
player: Player,
key: String
): Int
{
val playerHits = hitCounts.computeIfAbsent( player.uniqueId ) { ConcurrentHashMap() }
val newCount = playerHits.compute( key ) { _, current -> ( current ?: 0 ) + 1 } ?: 1
return newCount
}
fun getHits(player: Player, key: String): Int {
return hitCounts[player.uniqueId]?.get(key) ?: 0
fun getHits(
player: Player,
key: String
): Int
{
return hitCounts[player.uniqueId]?.get( key ) ?: 0
}
fun resetHits(player: Player, key: String) {
hitCounts[player.uniqueId]?.remove(key)
fun resetHits(
player: Player,
key: String
) {
hitCounts[player.uniqueId]?.remove( key )
}
fun hasReachedThreshold(player: Player, key: String, requiredHits: Int): Boolean {
return getHits(player, key) >= requiredHits
fun hasReachedThreshold(
player: Player,
key: String,
requiredHits: Int
): Boolean
{
return getHits( player, key ) >= requiredHits
}
fun getRemainingHits(player: Player, key: String, requiredHits: Int): Int {
val current = getHits(player, key)
return maxOf(0, requiredHits - current)
fun getRemainingHits(
player: Player,
key: String,
requiredHits: Int
): Int
{
val current = getHits( player, key )
return maxOf( 0, requiredHits - current )
}
fun clearAllHits(player: Player) {
hitCounts.remove(player.uniqueId)
fun clearAllHits(
player: Player
) {
hitCounts.remove( player.uniqueId )
}
fun clearAll() {
fun clearAll()
{
hitCounts.clear()
}
}