Merge pull request #162 from ToberoCat/claim-particle-module

Added more configurability to the claim particle modules

Author: ToberoCat

improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/claims/clustering/ChunkPosition.kt

@@ -1,7 +1,6 @@
 package io.github.toberocat.improvedfactions.claims.clustering
 
 import org.bukkit.Bukkit
-import kotlin.math.sqrt
 
 data class ChunkPosition(val x: Int, val y: Int, val world: String) {
 
@@ -39,7 +38,18 @@ data class ChunkPosition(val x: Int, val y: Int, val world: String) {
     )
 
     fun uniquId() = "$x-$y-$world"
-    operator fun minus(cellFrom: ChunkPosition) = ChunkPosition(x - cellFrom.x, y - cellFrom.y, world)
+
     fun toWorldPosition(): WorldPosition = WorldPosition(world, x * 16, y * 16)
+
     fun getChunk() = Bukkit.getWorld(world)?.getChunkAt(x, y)
+
+    fun getNeighbours(radius: Int): MutableList<ChunkPosition> {
+        val neightbours = mutableListOf<ChunkPosition>()
+        for (i in -radius..radius)
+            for (j in -radius..radius)
+                neightbours.add(ChunkPosition(x + i, y + j, world))
+        return neightbours
+    }
+
+    operator fun minus(cellFrom: ChunkPosition) = ChunkPosition(x - cellFrom.x, y - cellFrom.y, world)
 }

improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/claims/clustering/Cluster.kt

@@ -18,6 +18,7 @@ abstract class Cluster(val id: UUID, private val positions: MutableSet<ChunkPosi
     }
 
     abstract fun scheduleUpdate()
+    abstract fun getColor(): Int
 
     fun getOuterNodes() = outerNodes.get()
 
@@ -80,6 +81,7 @@ abstract class Cluster(val id: UUID, private val positions: MutableSet<ChunkPosi
                 val allowedAxis = next.allowedAxis()
                 next = openSupportingPoints.filter { it.isSameAxis(next!!, allowedAxis) }.minByOrNull { it.distanceTo(next!!) }
             }
+            loop.add(loop.first()) // Close the polygon
             outerNodes.add(loop)
         }
         return outerNodes

improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/claims/clustering/ClusterExtension.kt

@@ -0,0 +1,12 @@
+package io.github.toberocat.improvedfactions.claims.clustering
+
+import io.github.toberocat.improvedfactions.ImprovedFactionsPlugin
+import org.bukkit.entity.Player
+
+object ClusterExtension {
+    fun Player.getCurrentClusters(chunkRenderDistance: Int) = location.world?.name?.let { world ->
+        ChunkPosition(location.chunk.x, location.chunk.z, world)
+            .getNeighbours(chunkRenderDistance)
+            .mapNotNull { ImprovedFactionsPlugin.instance.claimChunkClusters.getCluster(it) }
+    } ?: emptyList()
+}

improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/claims/clustering/FactionCluster.kt

@@ -1,5 +1,6 @@
 package io.github.toberocat.improvedfactions.claims.clustering
 
+import io.github.toberocat.improvedfactions.factions.FactionHandler
 import io.github.toberocat.improvedfactions.modules.power.PowerRaidsModule.Companion.powerRaidModule
 import io.github.toberocat.improvedfactions.modules.power.handles.FactionPowerRaidModuleHandle
 import io.github.toberocat.improvedfactions.utils.LazyUpdate
@@ -13,11 +14,10 @@ class FactionCluster(val factionId: Int, id: UUID, positions: MutableSet<ChunkPo
         }
     }
 
-    override fun scheduleUpdate() {
-        unprotectedPositions.scheduleUpdate()
-    }
+    override fun scheduleUpdate() = unprotectedPositions.scheduleUpdate()
+
+    fun isUnprotected(x: Int, y: Int, world: String) = ChunkPosition(x, y, world) in unprotectedPositions.get()
+
+    override fun getColor() = FactionHandler.generateColor(factionId)
 
-    fun isUnprotected(x: Int, y: Int, world: String): Boolean {
-        return ChunkPosition(x, y, world) in unprotectedPositions.get()
-    }
 }

improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/claims/clustering/ZoneCluster.kt

@@ -1,7 +1,9 @@
 package io.github.toberocat.improvedfactions.claims.clustering
 
+import io.github.toberocat.improvedfactions.zone.ZoneHandler
 import java.util.*
 
 class ZoneCluster(val zoneType: String, id: UUID, positions: MutableSet<ChunkPosition>) : Cluster(id, positions) {
     override fun scheduleUpdate() = Unit
+    override fun getColor(): Int = ZoneHandler.getZone(zoneType)?.mapColor ?: 0xffffff
 }

improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/factions/Faction.kt

@@ -97,11 +97,8 @@ class Faction(id: EntityID<Int>) : IntEntity(id) {
         super.delete()
     }
 
-    fun generateColor() = Integer.parseInt(
-        Integer.toHexString("${id.value}-${Bukkit.getServer().name}".hashCode())
-            .padStart(6, '0')
-            .substring(0, 6), 16
-    )
+    fun generateColor() = FactionHandler.generateColor(id.value)
+
 
     fun setMaxPower(newMaxPower: Int) {
         val actualNewMaxPower = max(newMaxPower, 0)
@@ -185,7 +182,9 @@ class Faction(id: EntityID<Int>) : IntEntity(id) {
             invitedId = invitedUserId
             factionId = factId
             this.rankId = rankId
-            expirationDate = Clock.System.now().plus(5, DateTimeUnit.MINUTE).toLocalDateTime(TimeZone.UTC)
+            expirationDate = Clock.System.now()
+                .plus(5, DateTimeUnit.MINUTE)
+                .toLocalDateTime(TimeZone.UTC)
         }
         Bukkit.getScheduler().runTaskLater(
             ImprovedFactionsPlugin.instance,

improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/factions/FactionHandler.kt

@@ -38,6 +38,12 @@ object FactionHandler {
         }
     }
 
+    fun generateColor(id: Int) = Integer.parseInt(
+        Integer.toHexString("${id}-${Bukkit.getServer().name}".hashCode())
+            .padStart(6, '0')
+            .substring(0, 6), 16
+    )
+
     fun getFactions(): SizedIterable<Faction> {
         return loggedTransaction { return@loggedTransaction Faction.all() }
     }

improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/ModuleManager.kt

@@ -4,6 +4,7 @@ import io.github.toberocat.improvedfactions.ImprovedFactionsPlugin
 import io.github.toberocat.improvedfactions.ImprovedFactionsPlugin.Companion.instance
 import io.github.toberocat.improvedfactions.modules.base.BaseModule
 import io.github.toberocat.improvedfactions.modules.chat.ChatModule
+import io.github.toberocat.improvedfactions.modules.claimparticle.ClaimParticleModule
 import io.github.toberocat.improvedfactions.modules.dynmap.DynmapModule
 import io.github.toberocat.improvedfactions.modules.gui.GuiModule
 import io.github.toberocat.improvedfactions.modules.home.HomeModule
@@ -20,7 +21,8 @@ class ModuleManager(private val plugin: ImprovedFactionsPlugin) {
         WildernessModule.wildernessPair(),
         HomeModule.homePair(),
         ChatModule.chatPair(),
-        GuiModule.guiPair()
+        GuiModule.guiPair(),
+        ClaimParticleModule.claimParticlesPair()
     )
 
     init {

improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/claimparticle/ClaimParticleModule.kt

@@ -1,3 +1,29 @@
 package io.github.toberocat.improvedfactions.modules.claimparticle
 
-class ClaimParticleModule
+import io.github.toberocat.improvedfactions.ImprovedFactionsPlugin
+import io.github.toberocat.improvedfactions.modules.base.BaseModule
+import io.github.toberocat.improvedfactions.modules.claimparticle.config.ClaimParticleModuleConfig
+import io.github.toberocat.improvedfactions.modules.claimparticle.handles.RenderParticlesTask
+
+class ClaimParticleModule : BaseModule {
+    override val moduleName: String
+        get() = MODULE_NAME
+
+    val config = ClaimParticleModuleConfig()
+
+    override fun onEnable(plugin: ImprovedFactionsPlugin) {
+        RenderParticlesTask(config).runTaskTimer(plugin, config.particleSpawnInterval, config.particleSpawnInterval)
+    }
+
+    override fun reloadConfig(plugin: ImprovedFactionsPlugin) {
+        config.reload(plugin.config)
+    }
+
+    companion object {
+        const val MODULE_NAME = "claim-particles"
+        fun claimParticlesModule() =
+            ImprovedFactionsPlugin.instance.moduleManager.getModule<ClaimParticleModule>(MODULE_NAME)
+
+        fun claimParticlesPair() = MODULE_NAME to ClaimParticleModule()
+    }
+}

improved-factions-base/src/main/kotlin/io/github/toberocat/improvedfactions/modules/claimparticle/config/ClaimParticleModuleConfig.kt

@@ -0,0 +1,30 @@
+package io.github.toberocat.improvedfactions.modules.claimparticle.config
+
+import org.bukkit.configuration.file.FileConfiguration
+
+data class ClaimParticleModuleConfig(
+    var particleCount: Int = 2,
+    var particleSpeed: Double = 0.0,
+    var particleSpread: Double = 0.1,
+    var blockRenderDistance: Int = 30 * 30,
+    var chunkRenderDistance: Int = 1,
+    var minParticleSize: Float = 0.0f,
+    var maxParticleSize: Float = 2.0f,
+    var particleSizeBias: Float = 0.5f,
+    var particleSpawnInterval: Long = 15
+) {
+    private val configPath = "factions.claim-particles"
+
+    fun reload(config: FileConfiguration) {
+        particleCount = config.getInt("$configPath.particle-count", particleCount)
+        particleSpeed = config.getDouble("$configPath.particle-speed", particleSpeed)
+        particleSpread = config.getDouble("$configPath.particle-spread", particleSpread)
+        chunkRenderDistance = config.getInt("$configPath.chunk-render-distance", chunkRenderDistance)
+        minParticleSize = config.getDouble("$configPath.min-particle-size", minParticleSize.toDouble()).toFloat()
+        maxParticleSize = config.getDouble("$configPath.max-particle-size", maxParticleSize.toDouble()).toFloat()
+        particleSizeBias = config.getDouble("$configPath.particle-size-bias", particleSizeBias.toDouble()).toFloat()
+        particleSpawnInterval = config.getLong("$configPath.particle-spawn-interval", particleSpawnInterval)
+
+        config.getInt("$configPath.block-render-distance", blockRenderDistance).also { blockRenderDistance = it * it }
+    }
+}