libreforge-updater

build.gradle

@@ -58,11 +58,13 @@ 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'
+        compileOnly 'com.willfp:eco:6.35.1'
-        implementation 'com.willfp:libreforge:3.34.1'
+        implementation 'com.willfp:libreforge:3.71.0'
+        implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'
 
@@ -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
@@ -42,8 +43,7 @@ var ItemStack.bossEgg: EcoBoss?
         this.itemMeta = meta
     }
     get() {
-        val meta = this.itemMeta ?: return null
+        val pdc = this.fast().persistentDataContainer
-        val pdc = meta.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")
 

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/lifecycle/DeathListeners.kt

@@ -1,9 +1,9 @@
 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.Listener

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
+  - TMMobcoins
-  - DeluxeSellwands
+  - EcoEnchants
+  - Talismans
+  - EcoArmor
+  - EcoItems
+  - EcoSkills
+  - Boosters
 
 commands:
   ecobosses:

gradle.properties

@@ -1,2 +1,4 @@
-version = 8.21.1
+#libreforge-updater
-plugin-name = EcoBosses
+#Sun Jun 26 13:03:03 BST 2022
+version=8.56.0
+plugin-name=EcoBosses