mirror of
https://github.com/Auxilor/EcoMobs.git
synced 2025-12-19 23:19:17 +00:00
Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
16c9640163 | ||
|
|
8ed4dbc9d3 | ||
|
|
3805f8e2dd | ||
|
|
97e0832f7a | ||
|
|
99a3a1f4a9 | ||
|
|
87989ef899 | ||
|
|
754ab3b6fe | ||
|
|
8b0dfd4d8c | ||
|
|
bb73e2e8f7 | ||
|
|
4ab79995b3 |
@@ -30,7 +30,9 @@ import com.willfp.libreforge.loader.LibreforgePlugin
|
|||||||
import com.willfp.libreforge.loader.configs.ConfigCategory
|
import com.willfp.libreforge.loader.configs.ConfigCategory
|
||||||
import com.willfp.libreforge.mutators.Mutators
|
import com.willfp.libreforge.mutators.Mutators
|
||||||
import com.willfp.libreforge.registerHolderProvider
|
import com.willfp.libreforge.registerHolderProvider
|
||||||
|
import com.willfp.libreforge.registerSpecificHolderProvider
|
||||||
import com.willfp.libreforge.triggers.Triggers
|
import com.willfp.libreforge.triggers.Triggers
|
||||||
|
import org.bukkit.entity.Player
|
||||||
import org.bukkit.event.Listener
|
import org.bukkit.event.Listener
|
||||||
|
|
||||||
class EcoBossesPlugin : LibreforgePlugin() {
|
class EcoBossesPlugin : LibreforgePlugin() {
|
||||||
@@ -52,7 +54,9 @@ class EcoBossesPlugin : LibreforgePlugin() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun handleEnable() {
|
override fun handleEnable() {
|
||||||
registerHolderProvider { it.bossHolders }
|
registerSpecificHolderProvider<Player> {
|
||||||
|
it.bossHolders
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun handleReload() {
|
override fun handleReload() {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import com.willfp.eco.core.display.DisplayModule
|
|||||||
import com.willfp.eco.core.display.DisplayPriority
|
import com.willfp.eco.core.display.DisplayPriority
|
||||||
import com.willfp.eco.core.fast.fast
|
import com.willfp.eco.core.fast.fast
|
||||||
import com.willfp.libreforge.SimpleProvidedHolder
|
import com.willfp.libreforge.SimpleProvidedHolder
|
||||||
|
import com.willfp.libreforge.toDispatcher
|
||||||
import org.bukkit.entity.Player
|
import org.bukkit.entity.Player
|
||||||
import org.bukkit.inventory.ItemStack
|
import org.bukkit.inventory.ItemStack
|
||||||
|
|
||||||
@@ -27,7 +28,7 @@ class EggDisplay(
|
|||||||
val egg = itemStack.bossEgg ?: return
|
val egg = itemStack.bossEgg ?: return
|
||||||
|
|
||||||
val lines = egg.spawnConditions
|
val lines = egg.spawnConditions
|
||||||
.filterNot { it.isMet(player, SimpleProvidedHolder(egg)) }
|
.filterNot { it.isMet(player.toDispatcher(), SimpleProvidedHolder(egg)) }
|
||||||
.map { it.notMetLines.map { line -> Display.PREFIX + line } }
|
.map { it.notMetLines.map { line -> Display.PREFIX + line } }
|
||||||
.flatten()
|
.flatten()
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.willfp.ecobosses.bosses.Bosses
|
|||||||
import com.willfp.ecobosses.bosses.EcoBoss
|
import com.willfp.ecobosses.bosses.EcoBoss
|
||||||
import com.willfp.ecobosses.events.BossTryDropItemEvent
|
import com.willfp.ecobosses.events.BossTryDropItemEvent
|
||||||
import com.willfp.libreforge.effects.templates.MultiMultiplierEffect
|
import com.willfp.libreforge.effects.templates.MultiMultiplierEffect
|
||||||
|
import com.willfp.libreforge.toDispatcher
|
||||||
import org.bukkit.event.EventHandler
|
import org.bukkit.event.EventHandler
|
||||||
|
|
||||||
object EffectBossDropChanceMultiplier : MultiMultiplierEffect<EcoBoss>("boss_drop_chance_multiplier") {
|
object EffectBossDropChanceMultiplier : MultiMultiplierEffect<EcoBoss>("boss_drop_chance_multiplier") {
|
||||||
@@ -21,7 +22,7 @@ object EffectBossDropChanceMultiplier : MultiMultiplierEffect<EcoBoss>("boss_dro
|
|||||||
fun handle(event: BossTryDropItemEvent) {
|
fun handle(event: BossTryDropItemEvent) {
|
||||||
val player = event.player ?: return
|
val player = event.player ?: return
|
||||||
|
|
||||||
val multiplier = getMultiplier(player, event.boss)
|
val multiplier = getMultiplier(player.toDispatcher(), event.boss)
|
||||||
|
|
||||||
event.chance *= multiplier
|
event.chance *= multiplier
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.willfp.ecobosses.libreforge
|
package com.willfp.ecobosses.libreforge
|
||||||
|
|
||||||
import com.willfp.ecobosses.events.BossKillEvent
|
import com.willfp.ecobosses.events.BossKillEvent
|
||||||
|
import com.willfp.libreforge.toDispatcher
|
||||||
import com.willfp.libreforge.triggers.Trigger
|
import com.willfp.libreforge.triggers.Trigger
|
||||||
import com.willfp.libreforge.triggers.TriggerData
|
import com.willfp.libreforge.triggers.TriggerData
|
||||||
import com.willfp.libreforge.triggers.TriggerParameter
|
import com.willfp.libreforge.triggers.TriggerParameter
|
||||||
@@ -20,7 +21,7 @@ object TriggerKillBoss : Trigger("kill_boss") {
|
|||||||
val entity = event.boss.entity
|
val entity = event.boss.entity
|
||||||
|
|
||||||
this.dispatch(
|
this.dispatch(
|
||||||
killer,
|
killer.toDispatcher(),
|
||||||
TriggerData(
|
TriggerData(
|
||||||
player = killer,
|
player = killer,
|
||||||
victim = entity,
|
victim = entity,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.willfp.ecobosses.libreforge
|
package com.willfp.ecobosses.libreforge
|
||||||
|
|
||||||
import com.willfp.ecobosses.events.BossSpawnEvent
|
import com.willfp.ecobosses.events.BossSpawnEvent
|
||||||
|
import com.willfp.libreforge.toDispatcher
|
||||||
import com.willfp.libreforge.triggers.Trigger
|
import com.willfp.libreforge.triggers.Trigger
|
||||||
import com.willfp.libreforge.triggers.TriggerData
|
import com.willfp.libreforge.triggers.TriggerData
|
||||||
import com.willfp.libreforge.triggers.TriggerParameter
|
import com.willfp.libreforge.triggers.TriggerParameter
|
||||||
@@ -18,7 +19,7 @@ object TriggerSpawnBoss : Trigger("spawn_boss") {
|
|||||||
val location = event.location
|
val location = event.location
|
||||||
|
|
||||||
this.dispatch(
|
this.dispatch(
|
||||||
player,
|
player.toDispatcher(),
|
||||||
TriggerData(
|
TriggerData(
|
||||||
player = player,
|
player = player,
|
||||||
location = location
|
location = location
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.willfp.ecobosses.EcoBossesPlugin
|
|||||||
import com.willfp.ecobosses.bosses.bossEgg
|
import com.willfp.ecobosses.bosses.bossEgg
|
||||||
import com.willfp.ecobosses.events.BossSpawnEvent
|
import com.willfp.ecobosses.events.BossSpawnEvent
|
||||||
import com.willfp.libreforge.SimpleProvidedHolder
|
import com.willfp.libreforge.SimpleProvidedHolder
|
||||||
|
import com.willfp.libreforge.toDispatcher
|
||||||
import org.bukkit.Bukkit
|
import org.bukkit.Bukkit
|
||||||
import org.bukkit.Location
|
import org.bukkit.Location
|
||||||
import org.bukkit.block.Container
|
import org.bukkit.block.Container
|
||||||
@@ -79,7 +80,7 @@ class SpawnEggHandler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (player != null) {
|
if (player != null) {
|
||||||
if (!boss.spawnConditions.areMet(player, SimpleProvidedHolder(boss))) {
|
if (!boss.spawnConditions.areMet(player.toDispatcher(), SimpleProvidedHolder(boss))) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.willfp.ecobosses.bosses.Bosses
|
|||||||
import com.willfp.ecobosses.events.BossSpawnEvent
|
import com.willfp.ecobosses.events.BossSpawnEvent
|
||||||
import com.willfp.ecobosses.util.SpawnTotem
|
import com.willfp.ecobosses.util.SpawnTotem
|
||||||
import com.willfp.libreforge.SimpleProvidedHolder
|
import com.willfp.libreforge.SimpleProvidedHolder
|
||||||
|
import com.willfp.libreforge.toDispatcher
|
||||||
import org.bukkit.Bukkit
|
import org.bukkit.Bukkit
|
||||||
import org.bukkit.Material
|
import org.bukkit.Material
|
||||||
import org.bukkit.block.Block
|
import org.bukkit.block.Block
|
||||||
@@ -55,7 +56,7 @@ class SpawnTotemHandler : Listener {
|
|||||||
|
|
||||||
val player = event.player
|
val player = event.player
|
||||||
|
|
||||||
if (!boss.spawnConditions.areMet(player, SimpleProvidedHolder(boss))) {
|
if (!boss.spawnConditions.areMet(player.toDispatcher(), SimpleProvidedHolder(boss))) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#libreforge-updater
|
#libreforge-updater
|
||||||
#Sat Oct 28 14:15:22 BST 2023
|
#Thu Nov 30 14:27:19 GMT 2023
|
||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
libreforge-version=4.38.1
|
libreforge-version=4.47.0
|
||||||
version=9.37.1
|
version=9.46.0
|
||||||
|
|||||||
Reference in New Issue
Block a user