libreforge-updater

# Conflicts:
#	build.gradle
#	gradle.properties

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">
   <br>
-    <img src="https://i.imgur.com/A2qieC3.png" alt="EcoBosses logo" width="256">
+    <img src="https://i.imgur.com/3n3ssb4.png" alt="EcoBosses logo" width="256">
   <br>
 </h1>
 

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
     }
 }
 
@@ -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.24.0'
-        implementation 'com.willfp:libreforge:3.17.0'
+        compileOnly 'com.willfp:eco:6.35.1'
+        implementation 'com.willfp:libreforge:3.71.0'
+        implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'
 
-        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.0'
+        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21'
     }
 
     tasks.withType(JavaCompile) {
@@ -119,3 +121,15 @@ compileJava.options.encoding = 'UTF-8'
 
 build.dependsOn shadowJar
 build.dependsOn publishToMavenLocal
+
+task buyThePlugins {
+    dependsOn subprojects.build
+
+    doLast {
+        println 'If you like the plugin, please consider buying it on Spigot or Polymart!'
+        println 'Spigot: https://www.spigotmc.org/resources/authors/auxilor.507394/'
+        println 'Polymart: https://polymart.org/user/auxilor.1107/'
+        println 'Buying gives you access to support and the plugin auto-updater, and it allows me to keep developing plugins.'
+    }
+}
+build.finalizedBy buyThePlugins

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 = 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/ConfiguredGoal.kt

@@ -0,0 +1,8 @@
+package com.willfp.ecobosses.bosses
+
+import com.willfp.eco.core.entities.ai.Goal
+
+data class ConfiguredGoal<T : Goal<*>>(
+    val priority: Int,
+    val goal: T
+)

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

@@ -5,12 +5,14 @@ import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.core.entities.CustomEntity
 import com.willfp.eco.core.entities.Entities
 import com.willfp.eco.core.entities.TestableEntity
+import com.willfp.eco.core.entities.ai.*
 import com.willfp.eco.core.items.CustomItem
 import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.items.builder.ItemStackBuilder
 import com.willfp.eco.core.recipe.Recipes
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
 import com.willfp.eco.core.recipe.recipes.CraftingRecipe
+import com.willfp.eco.util.NamespacedKeyUtils
 import com.willfp.eco.util.toComponent
 import com.willfp.ecobosses.events.BossKillEvent
 import com.willfp.ecobosses.lifecycle.BossLifecycle
@@ -24,15 +26,17 @@ import org.bukkit.Bukkit
 import org.bukkit.Location
 import org.bukkit.Material
 import org.bukkit.entity.LivingEntity
+import org.bukkit.entity.Mob
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
+import org.bukkit.persistence.PersistentDataType
 import java.util.*
 
 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")
 
@@ -157,6 +161,22 @@ class EcoBoss(
         locations
     }
 
+    val hasCustomAI = config.getBool("customai.enabled")
+
+    val targetGoals = config.getSubsections("customai.target-goals").mapNotNull {
+        val key = NamespacedKeyUtils.fromStringOrNull(it.getString("key")) ?: return@mapNotNull null
+        val deserializer = TargetGoals.getByKey(key) ?: return@mapNotNull null
+        val goal = deserializer.deserialize(it.getSubsection("args")) ?: return@mapNotNull null
+        ConfiguredGoal(it.getInt("priority"), goal)
+    }
+
+    val entityGoals = config.getSubsections("customai.ai-goals").mapNotNull {
+        val key = NamespacedKeyUtils.fromStringOrNull(it.getString("key")) ?: return@mapNotNull null
+        val deserializer = EntityGoals.getByKey(key) ?: return@mapNotNull null
+        val goal = deserializer.deserialize(it.getSubsection("args")) ?: return@mapNotNull null
+        ConfiguredGoal(it.getInt("priority"), goal)
+    }
+
     val spawnConditions = config.getSubsections("spawn.conditions").mapNotNull {
         Conditions.compile(it, "$id Spawn Conditions")
     }
@@ -189,6 +209,16 @@ class EcoBoss(
         map
     }
 
+    private val commands: Map<BossLifecycle, LocalCommands> = run {
+        val map = mutableMapOf<BossLifecycle, LocalCommands>()
+
+        for (value in BossLifecycle.values()) {
+            map[value] = LocalCommands(config.getStrings("commands.${value.name.lowercase()}"))
+        }
+
+        map
+    }
+
     private val commandRewards: Map<Int, Iterable<CommandReward>> = run {
         val map = mutableMapOf<Int, Iterable<CommandReward>>()
 
@@ -280,10 +310,25 @@ class EcoBoss(
     }
 
     fun spawn(location: Location): LivingEcoBoss {
-        val mob = mob.spawn(location) as LivingEntity
+        val mob = mob.spawn(location) as Mob
         mob.isPersistent = true
         mob.isCustomNameVisible = true
         mob.removeWhenFarAway = false
+        mob.persistentDataContainer.set(
+            plugin.namespacedKeyFactory.create("boss"),
+            PersistentDataType.STRING,
+            this.id
+        )
+
+        if (hasCustomAI) {
+            val controller = EntityController.getFor(mob)
+                .clearAllGoals()
+
+            @Suppress("UNCHECKED_CAST") // What could go wrong?
+            targetGoals.forEach { controller.addTargetGoal(it.priority, it.goal as TargetGoal<in Mob>) }
+            @Suppress("UNCHECKED_CAST")
+            entityGoals.forEach { controller.addEntityGoal(it.priority, it.goal as EntityGoal<in Mob>) }
+        }
 
         val boss = LivingEcoBoss(
             plugin,
@@ -322,6 +367,7 @@ class EcoBoss(
     fun handleLifecycle(lifecycle: BossLifecycle, location: Location, entity: LivingEntity?) {
         sounds[lifecycle]?.play(location)
         messages[lifecycle]?.forEach { it.broadcast(location, entity?.topDamagers ?: emptyList()) }
+        commands[lifecycle]?.dispatch(location, entity?.topDamagers ?: emptyList())
     }
 
     fun processRewards(event: BossKillEvent) {

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/TargetMode.kt

@@ -3,6 +3,7 @@ package com.willfp.ecobosses.bosses
 import com.google.common.collect.BiMap
 import com.google.common.collect.HashBiMap
 import com.google.common.collect.ImmutableList
+import org.bukkit.GameMode
 import org.bukkit.entity.Entity
 import org.bukkit.entity.LivingEntity
 import org.bukkit.entity.Player
@@ -23,7 +24,9 @@ class TargetMode(
                 boss.boss.targetRange,
                 boss.boss.targetRange,
                 boss.boss.targetRange
-            ).filterIsInstance<Player>(),
+            ).filterIsInstance<Player>()
+                .filter { listOf(GameMode.SURVIVAL, GameMode.ADVENTURE).contains(it.gameMode) }
+                .ifEmpty { return null },
             entity
         )
     }

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

@@ -31,6 +31,7 @@ class BossSpawnEvent(
         TOTEM,
         EGG,
         COMMAND,
+        AUTOSPAWN,
         UNKNOWN
     }
 

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/spawn/AutospawnHandler.kt

@@ -2,6 +2,8 @@ package com.willfp.ecobosses.spawn
 
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.ecobosses.bosses.Bosses
+import com.willfp.ecobosses.events.BossSpawnEvent
+import org.bukkit.Bukkit
 
 object AutospawnHandler {
     private var tick = 1
@@ -20,12 +22,20 @@ object AutospawnHandler {
                 val location = boss.autoSpawnLocations.randomOrNull() ?: continue
                 val world = location.world ?: continue
 
+                if (plugin.configYml.getBool("autospawn.one-boss-per-world")) {
                     if (Bosses.getAllAlive().mapNotNull { it.entity }.any { it.world == world }) {
                         continue
                     }
+                }
 
+                val spawnEvent = BossSpawnEvent(boss, location, BossSpawnEvent.SpawnReason.AUTOSPAWN, null)
+
+                Bukkit.getPluginManager().callEvent(spawnEvent)
+
+                if (!spawnEvent.isCancelled) {
                     boss.spawn(location)
                 }
+            }
 
             tick++
         }

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

@@ -4,6 +4,7 @@ import com.willfp.eco.util.containsIgnoreCase
 import com.willfp.ecobosses.bosses.Bosses
 import com.willfp.ecobosses.events.BossSpawnEvent
 import com.willfp.ecobosses.util.SpawnTotem
+import org.bukkit.Bukkit
 import org.bukkit.Material
 import org.bukkit.block.Block
 import org.bukkit.event.EventHandler
@@ -16,36 +17,36 @@ class SpawnTotemHandler : Listener {
     )
     fun handle(event: BlockPlaceEvent) {
         for (i in 0..2) {
-            lateinit var block1: Block
-            lateinit var block2: Block
-            lateinit var block3: Block
+            lateinit var top: Block
+            lateinit var middle: Block
+            lateinit var bottom: Block
 
             // I know this code sucks ass, but I can't be arsed to write it nicely
             when (i) {
                 0 -> {
-                    block3 = event.block
-                    block2 = event.block.getRelative(0, -1, 0)
-                    block1 = event.block.getRelative(0, -2, 0)
+                    top = event.block
+                    middle = event.block.getRelative(0, -1, 0)
+                    bottom = event.block.getRelative(0, -2, 0)
                 }
                 1 -> {
-                    block1 = event.block
-                    block2 = event.block.getRelative(0, 1, 0)
-                    block3 = event.block.getRelative(0, 2, 0)
+                    top = event.block.getRelative(0, 2, 0)
+                    middle = event.block.getRelative(0, 1, 0)
+                    bottom = event.block
                 }
                 2 -> {
-                    block2 = event.block
-                    block1 = event.block.getRelative(0, -1, 0)
-                    block3 = event.block.getRelative(0, 1, 0)
+                    top = event.block.getRelative(0, 1, 0)
+                    middle = event.block
+                    bottom = event.block.getRelative(0, -1, 0)
                 }
             }
 
-            val placedTotem = SpawnTotem(block1.type, block2.type, block3.type)
+            val placedTotem = SpawnTotem(top.type, middle.type, bottom.type)
             for (boss in Bosses.values()) {
                 if (boss.totem == null || boss.disabledTotemWorlds.containsIgnoreCase(event.block.world.name)) {
                     continue
                 }
 
-                if (boss.totem != placedTotem) {
+                if (!boss.totem.matches(placedTotem)) {
                     continue
                 }
 
@@ -57,10 +58,12 @@ class SpawnTotemHandler : Listener {
 
                 val spawnEvent = BossSpawnEvent(boss, event.block.location, BossSpawnEvent.SpawnReason.TOTEM, player)
 
+                Bukkit.getPluginManager().callEvent(spawnEvent)
+
                 if (!spawnEvent.isCancelled) {
-                    block1.type = Material.AIR
-                    block2.type = Material.AIR
-                    block3.type = Material.AIR
+                    top.type = Material.AIR
+                    middle.type = Material.AIR
+                    bottom.type = Material.AIR
 
                     boss.spawn(event.block.location.add(0.0, 1.5, 0.0))
                 }

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/kotlin/com/willfp/ecobosses/util/LocalCommands.kt

@@ -0,0 +1,38 @@
+package com.willfp.ecobosses.util
+
+import com.willfp.eco.core.config.interfaces.Config
+import com.willfp.eco.util.NumberUtils
+import com.willfp.eco.util.savedDisplayName
+import com.willfp.ecobosses.EcoBossesPlugin
+import org.bukkit.Bukkit
+import org.bukkit.Location
+
+data class LocalCommands(
+    val commands: Iterable<String>,
+) {
+    fun dispatch(location: Location, topDamagers: List<Damager>) {
+        val toDispatch = commands.toMutableList()
+        toDispatch.replaceAll {
+            var command = it
+
+            for (i in 1..20) {
+                val damager = topDamagers.getOrNull(i - 1)
+                val damage = if (damager?.damage != null) NumberUtils.format(damager.damage) else
+                    EcoBossesPlugin.instance.langYml.getFormattedString("na")
+                val player = if (damager?.uuid != null) Bukkit.getOfflinePlayer(damager.uuid).savedDisplayName else
+                    EcoBossesPlugin.instance.langYml.getFormattedString("na")
+
+                command = command.replace("%damage_${i}%", damage)
+                    .replace("%damage_${i}_player%", player)
+            }
+
+            command.replace("%x%", location.blockX.toString())
+                .replace("%y%", location.blockY.toString())
+                .replace("%z%", location.blockZ.toString())
+        }
+
+        for (s in toDispatch) {
+            Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), s);
+        }
+    }
+}

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

@@ -6,4 +6,10 @@ data class SpawnTotem(
     val top: Material,
     val middle: Material,
     val bottom: Material
-)
+) {
+    fun matches(totem: SpawnTotem): Boolean {
+        return this.top == totem.top
+                && this.middle == totem.middle
+                && this.bottom == totem.bottom
+    }
+}

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

@@ -6,6 +6,9 @@
 discover-recipes: true
 log-spawn-kill: true
 
+autospawn:
+  one-boss-per-world: true # If only one boss can auto-spawn per world at once.
+
 cooldown:
   in-actionbar: true
   sound:
@@ -33,3 +36,14 @@ point-names: # If you have point names that look ugly (eg g_souls) then you can
 use-faster-move-trigger: true # Disable if you want move trigger to detect sub-1-block movements
 raytrace-distance: 80 # The distance that alt_click should check for a location
 block-item-drop-place-check: true # If the block_item_drop trigger should only fire on naturally placed blocks (prevents dupes)
+
+potions:
+  icon:
+    permanent: true
+    triggered: true
+  ambient:
+    permanent: false
+    triggered: true
+  particles:
+    permanent: false
+    triggered: true

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/ecobosses.yml

@@ -26,6 +26,10 @@ bosses:
     # Supported placeholders: %health%, %time% (formats as minutes:seconds, eg 1:56)
     displayName: "&8Steel Golem &7| &c%health%♥ &7| &e%time%"
     influence: 40 # The distance at which effects will be applied to players
+    customai: # Custom mob AI using the entity goal system.
+      enabled: false # If custom AI should be enabled, this will override the vanilla mob behaviour.
+      target-goals: [ ] # How the boss decides who to attack, if the target mode isn't being used.
+      ai-goals: [ ] # How the boss should behave.
     effects: # Effects are done from the player's perspective: to treat the player as the victim, use the self_as_victim option in args
       - id: run_chain
         args:
@@ -123,6 +127,13 @@ bosses:
           - iron_block
           - netherite_block
           - iron_block
+    commands:
+      # For each category, you can add as many commands as you want, which will be executed by
+      # console. Supported placeholders are the same as for messages (see below)
+      spawn: [ ]
+      kill: [ ]
+      despawn: [ ]
+      injure: [ ]
     messages:
       # For each category, you can add as many messages as you want, each with their own radius.
       # Radius is the distance from the boss where the player will be sent the message

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

@@ -18,5 +18,6 @@ messages:
   on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
   cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
   cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
+  cannot-transmit: "&cYou can't transmit here!"
 
 na: "N/A"

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.3.0
+#libreforge-updater
+#Sun Jun 26 13:03:03 BST 2022
+version=8.56.0
 plugin-name=EcoBosses