Set seed for randomized boss bar color

Sytm · Oct 26, 2023 · dbc9ea3 · dbc9ea3
1 parent 2e1dde8
commit dbc9ea3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Partial update of chinese translations by [SnowCutieOwO](https://github.com/SnowCutieOwO)
 - The default config has been updated to replace some items with custom player heads
 - Holograms are now multiline by default
+- The color of the indicators in the boss bar no longer change every settings change or plugin config reload
 
 ### Fixed
 - Default colors for beacon beams are not applied

diff --git a/pointers/src/main/kotlin/de/md5lukas/waypoints/pointers/Trackable.kt b/pointers/src/main/kotlin/de/md5lukas/waypoints/pointers/Trackable.kt
@@ -1,5 +1,6 @@
 package de.md5lukas.waypoints.pointers
 
+import kotlin.random.Random
 import net.kyori.adventure.text.Component
 import org.bukkit.Location
 import org.bukkit.entity.Player
@@ -30,5 +31,8 @@ interface Trackable {
   val hologramItem: ItemStack?
     get() = null
 
+  val seed: Long
+    get() = Random.nextLong()
+
   fun asPredicate(): TrackablePredicate = { it === this }
 }
diff --git a/pointers/src/main/kotlin/de/md5lukas/waypoints/pointers/variants/BossBarPointer.kt b/pointers/src/main/kotlin/de/md5lukas/waypoints/pointers/variants/BossBarPointer.kt
@@ -63,7 +63,7 @@ internal class BossBarPointer(
 
     val data =
         targetData.computeIfAbsent(trackable) {
-          TargetData(0f, (it as? StaticTrackable)?.beaconColor?.textColor ?: randomColor())
+          TargetData(0f, (it as? StaticTrackable)?.beaconColor?.textColor ?: randomColor(it.seed))
         }
 
     // Don't calculate the position of the indicator everytime in favour to make the compass update
@@ -131,5 +131,6 @@ internal class BossBarPointer(
     return substring(modOffset, min(length, modOffset + size)) + substring(0, overhang)
   }
 
-  private fun randomColor() = TextColor.color(HSVLike.hsvLike(Random.nextFloat(), 1f, 1f))
+  private fun randomColor(seed: Long) =
+      TextColor.color(HSVLike.hsvLike(Random(seed).nextFloat(), 1f, 1f))
 }
diff --git a/waypoints/src/main/kotlin/de/md5lukas/waypoints/pointers/PlayerTrackable.kt b/waypoints/src/main/kotlin/de/md5lukas/waypoints/pointers/PlayerTrackable.kt
@@ -27,6 +27,9 @@ class PlayerTrackable(private val plugin: WaypointsPlugin, val player: Player) :
         }
       }
 
+  override val seed: Long
+    get() = player.uniqueId.mostSignificantBits
+
   override fun equals(other: Any?): Boolean {
     return player == (other as? PlayerTrackable)?.player
   }

diff --git a/waypoints/src/main/kotlin/de/md5lukas/waypoints/pointers/TemporaryWaypointTrackable.kt b/waypoints/src/main/kotlin/de/md5lukas/waypoints/pointers/TemporaryWaypointTrackable.kt
@@ -2,6 +2,7 @@ package de.md5lukas.waypoints.pointers
 
 import de.md5lukas.waypoints.WaypointsPlugin
 import de.md5lukas.waypoints.util.getResolvers
+import kotlin.random.Random
 import org.bukkit.Location
 import org.bukkit.entity.Player
 
@@ -11,6 +12,8 @@ class TemporaryWaypointTrackable(
     override val beaconColor: BeaconColor? = null,
 ) : StaticTrackable {
 
+  override val seed: Long = Random.nextLong()
+
   override fun getHologramText(player: Player, translatedTarget: Location) =
       plugin.apiExtensions.run {
         plugin.translations.POINTERS_HOLOGRAM_TEMPORARY.withReplacements(

diff --git a/waypoints/src/main/kotlin/de/md5lukas/waypoints/pointers/WaypointTrackable.kt b/waypoints/src/main/kotlin/de/md5lukas/waypoints/pointers/WaypointTrackable.kt
@@ -29,6 +29,9 @@ class WaypointTrackable(private val plugin: WaypointsPlugin, val waypoint: Waypo
 
   override val hologramItem = plugin.apiExtensions.run { waypoint.getIconStack() }
 
+  override val seed: Long
+    get() = waypoint.id.mostSignificantBits
+
   override fun equals(other: Any?): Boolean {
     return waypoint == (other as? WaypointTrackable)?.waypoint
   }