libreforge-updater

Fix spawning bosses on unloaded chunks

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
     }
 }
 
@@ -58,15 +58,17 @@ allprojects {
 
     shadowJar {
         relocate('com.willfp.libreforge', 'com.willfp.ecobosses.libreforge')
+        relocate('org.joml', 'com.willfp.ecobosses.libreforge.joml')
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:6.34.0'
-        implementation 'com.willfp:libreforge:3.34.1'
+        compileOnly 'com.willfp:eco:6.35.1'
+        implementation 'com.willfp:libreforge:3.79.0'
+        implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'
 
-        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21'
+        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10'
     }
 
     tasks.withType(JavaCompile) {
@@ -130,4 +132,4 @@ task buyThePlugins {
         println 'Buying gives you access to support and the plugin auto-updater, and it allows me to keep developing plugins.'
     }
 }
-build.finalizedBy buyThePlugins
+build.finalizedBy buyThePlugins

eco-core/build.gradle

@@ -1,2 +1,2 @@
 group 'com.willfp'
-version rootProject.version
+version rootProject.version

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/EcoBossesPlugin.kt

@@ -1,8 +1,10 @@
 package com.willfp.ecobosses
 
 import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.eco.core.display.DisplayModule
 import com.willfp.eco.core.integrations.IntegrationLoader
 import com.willfp.ecobosses.bosses.Bosses
+import com.willfp.ecobosses.bosses.EggDisplay
 import com.willfp.ecobosses.bosses.bossHolders
 import com.willfp.ecobosses.commands.CommandEcobosses
 import com.willfp.ecobosses.config.EcoBossesYml
@@ -23,7 +25,7 @@ import com.willfp.ecobosses.util.TopDamagerListener
 import com.willfp.libreforge.LibReforgePlugin
 import org.bukkit.event.Listener
 
-class EcoBossesPlugin : LibReforgePlugin(525, 10635, "&9") {
+class EcoBossesPlugin : LibReforgePlugin() {
     val ecoBossesYml: EcoBossesYml
 
     init {
@@ -44,6 +46,10 @@ class EcoBossesPlugin : LibReforgePlugin(525, 10635, "&9") {
         Bosses.getAllAlive().forEach { it.remove() }
     }
 
+    override fun createDisplayModule(): DisplayModule {
+        return EggDisplay(this)
+    }
+
     override fun loadPluginCommands(): List<PluginCommand> {
         return listOf(
             CommandEcobosses(this)
@@ -74,7 +80,7 @@ class EcoBossesPlugin : LibReforgePlugin(525, 10635, "&9") {
     }
 
     override fun getMinimumEcoVersion(): String {
-        return "6.24.0"
+        return "6.35.1"
     }
 
     companion object {

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/BossUtils.kt

@@ -1,5 +1,6 @@
 package com.willfp.ecobosses.bosses
 
+import com.willfp.eco.core.fast.fast
 import com.willfp.ecobosses.EcoBossesPlugin
 import com.willfp.libreforge.Holder
 import org.bukkit.entity.Player
@@ -13,7 +14,7 @@ val Player.bossHolders: Iterable<Holder>
 
         for (boss in Bosses.values()) {
             for (livingBoss in boss.getAllAlive()) {
-                val entity = livingBoss.entity ?: continue
+                val entity = livingBoss.entity
 
                 if (entity.world != this.world) {
                     continue
@@ -42,8 +43,7 @@ var ItemStack.bossEgg: EcoBoss?
         this.itemMeta = meta
     }
     get() {
-        val meta = this.itemMeta ?: return null
-        val pdc = meta.persistentDataContainer
+        val pdc = this.fast().persistentDataContainer
         val id = pdc.get(spawnEggKey, PersistentDataType.STRING) ?: return null
         return Bosses.getByID(id)
     }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt

@@ -36,7 +36,7 @@ class EcoBoss(
     val config: Config,
     private val plugin: EcoPlugin
 ) : Holder {
-    val id: String = config.getString("id")
+    override val id: String = config.getString("id")
 
     val displayName: String = config.getString("displayName")
 
@@ -332,7 +332,7 @@ class EcoBoss(
 
         val boss = LivingEcoBoss(
             plugin,
-            mob.uniqueId,
+            mob,
             this,
             createTickers()
         )
@@ -345,7 +345,8 @@ class EcoBoss(
             LifespanTicker(),
             DisplayNameTicker(),
             TargetTicker(),
-            TeleportHandler()
+            TeleportHandler(),
+            ChunkTicker()
         )
 
         if (isBossBarEnabled) {
@@ -371,7 +372,7 @@ class EcoBoss(
     }
 
     fun processRewards(event: BossKillEvent) {
-        val entity = event.boss.entity ?: return
+        val entity = event.boss.entity
         val location = entity.location
         val player = event.killer
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt

@@ -0,0 +1,41 @@
+package com.willfp.ecobosses.bosses
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.display.Display
+import com.willfp.eco.core.display.DisplayModule
+import com.willfp.eco.core.display.DisplayPriority
+import com.willfp.eco.core.fast.fast
+import org.bukkit.entity.Player
+import org.bukkit.inventory.ItemStack
+
+class EggDisplay(
+    plugin: EcoPlugin
+) : DisplayModule(
+    plugin,
+    DisplayPriority.LOW
+) {
+    override fun display(itemStack: ItemStack, player: Player?, vararg args: Any) {
+        if (player == null) {
+            return
+        }
+
+        val fis = itemStack.fast()
+
+        val lore = fis.lore.toMutableList()
+
+        val egg = itemStack.bossEgg ?: return
+
+        val lines = egg.spawnConditions
+            .filterNot { it.isMet(player) }
+            .mapNotNull { it.notMetLines?.map { line -> Display.PREFIX + line } }
+            .flatten()
+
+
+        if (lines.isNotEmpty()) {
+            lore.add(Display.PREFIX)
+            lore.addAll(lines)
+        }
+
+        fis.lore = lore
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/LivingEcoBoss.kt

@@ -2,13 +2,12 @@ package com.willfp.ecobosses.bosses
 
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.ecobosses.tick.BossTicker
-import org.bukkit.Bukkit
+import org.bukkit.Chunk
 import org.bukkit.entity.Mob
-import java.util.UUID
 
 class LivingEcoBoss(
     plugin: EcoPlugin,
-    private val uuid: UUID,
+    private val mob: Mob,
     val boss: EcoBoss,
     private val tickers: Set<BossTicker>
 ) {
@@ -18,15 +17,20 @@ class LivingEcoBoss(
         }
     }.apply { runTaskTimer(1, 1) }
 
-    val entity: Mob?
-        get() = Bukkit.getEntity(uuid) as? Mob
+    val entity: Mob
+        get() = mob
+
+    val chunk: Chunk
+        get() = entity.location.chunk
+
+    val forceLoadedChunks = mutableListOf<Chunk>()
 
     val deathTime = System.currentTimeMillis() + (boss.lifespan * 1000)
 
     private var currentTick = 1 // Start at 1 as 0 is divisible by everything
 
     private fun tick(): Boolean {
-        if (entity == null || entity?.isDead == true) {
+        if (entity.isDead) {
             remove()
             return true
         }
@@ -40,13 +44,15 @@ class LivingEcoBoss(
 
     fun remove() {
         ticker.cancel()
-        entity?.remove()
+        entity.remove()
         tickers.forEach { it.onDeath(this, currentTick) }
+        forceLoadedChunks.forEach { it.isForceLoaded = false }
+        forceLoadedChunks.clear()
 
-        boss.markDead(uuid)
+        boss.markDead(mob.uniqueId)
     }
 
     override fun toString(): String {
-        return "LivingEcoBoss{boss=${boss}, uuid=${uuid}}"
+        return "LivingEcoBoss{boss=${boss}, uuid=${mob.uniqueId}}"
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/TargetMode.kt

@@ -17,7 +17,7 @@ class TargetMode(
     }
 
     fun getTarget(boss: LivingEcoBoss): LivingEntity? {
-        val entity = boss.entity ?: return null
+        val entity = boss.entity
 
         return function(
             entity.getNearbyEntities(

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/ConsoleLoggers.kt

@@ -34,8 +34,8 @@ class ConsoleLoggers(
             return
         }
 
-        val loc = event.boss.entity?.location
-        val location = "${loc?.world?.name}: ${loc?.x}, ${loc?.y}, ${loc?.z}"
+        val loc = event.boss.entity.location
+        val location = "${loc.world?.name}: ${loc.x}, ${loc.y}, ${loc.z}"
 
         plugin.logger.info("&a${event.boss.boss.id}&r was killed by &a${event.killer?.name}&r at &a$location")
     }
@@ -48,8 +48,8 @@ class ConsoleLoggers(
         if (!plugin.configYml.getBool("log-spawn-kill")) {
             return
         }
-        val loc = event.boss.entity?.location
-        val location = "${loc?.world?.name}: ${loc?.x}, ${loc?.y}, ${loc?.z}"
+        val loc = event.boss.entity.location
+        val location = "${loc.world?.name}: ${loc.x}, ${loc.y}, ${loc.z}"
 
         plugin.logger.info("&a${event.boss.boss.id}&r despawned at &a$location")
     }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/DeathListeners.kt

@@ -1,11 +1,12 @@
 package com.willfp.ecobosses.lifecycle
 
 import com.willfp.eco.core.events.EntityDeathByEntityEvent
+import com.willfp.eco.util.tryAsPlayer
 import com.willfp.ecobosses.bosses.Bosses
 import com.willfp.ecobosses.events.BossKillEvent
-import com.willfp.libreforge.tryAsPlayer
 import org.bukkit.Bukkit
 import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.EntityDeathEvent
 
@@ -25,7 +26,8 @@ class DeathListeners : Listener {
     }
 
     @EventHandler(
-        ignoreCancelled = true
+        ignoreCancelled = true,
+        priority = EventPriority.HIGHEST
     )
     fun handle(event: EntityDeathEvent) {
         val boss = Bosses[event.entity] ?: return

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/LifecycleHandlers.kt

@@ -28,7 +28,7 @@ class LifecycleHandlers : Listener {
         priority = EventPriority.MONITOR
     )
     fun handle(event: BossKillEvent) {
-        val entity = event.boss.entity ?: return
+        val entity = event.boss.entity
 
         event.boss.boss.handleLifecycle(BossLifecycle.KILL, entity.location, entity)
     }
@@ -38,7 +38,7 @@ class LifecycleHandlers : Listener {
         priority = EventPriority.MONITOR
     )
     fun handle(event: BossDespawnEvent) {
-        val entity = event.boss.entity ?: return
+        val entity = event.boss.entity
 
         event.boss.boss.handleLifecycle(BossLifecycle.DESPAWN, entity.location, entity)
     }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/BossBarTicker.kt

@@ -12,7 +12,7 @@ class BossBarTicker(
     private val bar: BossBar
 ) : BossTicker {
     override fun tick(boss: LivingEcoBoss, tick: Int) {
-        val entity = boss.entity ?: return
+        val entity = boss.entity
 
         bar.name(entity.customName!!.toComponent())
         bar.progress((entity.health / entity.getAttribute(Attribute.GENERIC_MAX_HEALTH)!!.value).toFloat())

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/ChunkTicker.kt

@@ -0,0 +1,21 @@
+package com.willfp.ecobosses.tick
+
+import com.willfp.ecobosses.bosses.LivingEcoBoss
+
+class ChunkTicker : BossTicker {
+    override fun tick(boss: LivingEcoBoss, tick: Int) {
+        val currentChunk = boss.chunk
+
+        if (tick % 10 != 0) {
+            return
+        }
+
+        if (currentChunk.isLoaded && currentChunk.isForceLoaded) {
+            return;
+        }
+
+        currentChunk.load()
+        currentChunk.isForceLoaded = true
+        boss.forceLoadedChunks.add(currentChunk)
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/DisplayNameTicker.kt

@@ -7,7 +7,7 @@ import kotlin.math.ceil
 
 class DisplayNameTicker : BossTicker {
     override fun tick(boss: LivingEcoBoss, tick: Int) {
-        val entity = boss.entity ?: return
+        val entity = boss.entity
 
         val timeLeft = ceil(
             (boss.deathTime - System.currentTimeMillis()) / 1000.0

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/LifespanTicker.kt

@@ -16,7 +16,7 @@ class LifespanTicker : BossTicker {
             boss.remove()
             boss.boss.handleLifecycle(
                 BossLifecycle.DESPAWN,
-                boss.entity?.location ?: return,
+                boss.entity.location,
                 boss.entity
             )
         }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/TargetTicker.kt

@@ -4,7 +4,7 @@ import com.willfp.ecobosses.bosses.LivingEcoBoss
 
 class TargetTicker : BossTicker {
     override fun tick(boss: LivingEcoBoss, tick: Int) {
-        val entity = boss.entity ?: return
+        val entity = boss.entity
 
         if (tick % 10 != 0) {
             return

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/TeleportHandler.kt

@@ -7,7 +7,7 @@ import org.bukkit.block.BlockFace
 
 class TeleportHandler : BossTicker {
     override fun tick(boss: LivingEcoBoss, tick: Int) {
-        val entity = boss.entity ?: return
+        val entity = boss.entity
         if (!boss.boss.canTeleport) {
             return
         }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/util/EntityDamageTracking.kt

@@ -1,13 +1,13 @@
 package com.willfp.ecobosses.util
 
+import com.willfp.eco.util.tryAsPlayer
 import com.willfp.ecobosses.EcoBossesPlugin
-import com.willfp.libreforge.tryAsPlayer
 import org.bukkit.entity.LivingEntity
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.EntityDamageByEntityEvent
-import java.util.UUID
+import java.util.*
 
 data class Damager(
     val uuid: UUID,

eco-core/core-plugin/src/main/resources/eco.yml

@@ -0,0 +1,3 @@
+resource-id: 525
+bstats-id: 10635
+color: "&9"

eco-core/core-plugin/src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: EcoBosses
 version: ${projectVersion}
 main: com.willfp.ecobosses.EcoBossesPlugin
-api-version: 1.16
+api-version: 1.17
 authors: [Auxilor]
 website: willfp.com
 load: STARTUP
@@ -9,13 +9,17 @@ depend:
   - eco
 softdepend:
   - LevelledMobs
-  - EcoSkills
   - AureliumSkills
   - Jobs
   - mcMMO
   - Vault
-  - ShopGUIPlus
-  - DeluxeSellwands
+  - TMMobcoins
+  - EcoEnchants
+  - Talismans
+  - EcoArmor
+  - EcoItems
+  - EcoSkills
+  - Boosters
 
 commands:
   ecobosses:

gradle.properties

@@ -1,2 +1,4 @@
-version = 8.21.1
-plugin-name = EcoBosses
+#libreforge-updater
+#Wed Jul 27 20:17:09 BST 2022
+version=8.64.0
+plugin-name=EcoBosses