mirror of
https://github.com/Auxilor/EcoArmor.git
synced 2025-12-19 15:09:26 +00:00
Improved PR. TODO: Recode the whole plugin
This commit is contained in:
@@ -3,11 +3,15 @@ package com.willfp.ecoarmor
|
|||||||
import com.willfp.eco.core.command.impl.PluginCommand
|
import com.willfp.eco.core.command.impl.PluginCommand
|
||||||
import com.willfp.eco.core.display.DisplayModule
|
import com.willfp.eco.core.display.DisplayModule
|
||||||
import com.willfp.eco.core.items.Items
|
import com.willfp.eco.core.items.Items
|
||||||
import com.willfp.ecoarmor.api.PlayerArmorSetEventListeners
|
import com.willfp.ecoarmor.sets.PlayerArmorSetEventListeners
|
||||||
import com.willfp.ecoarmor.commands.CommandEcoArmor
|
import com.willfp.ecoarmor.commands.CommandEcoArmor
|
||||||
import com.willfp.ecoarmor.display.ArmorDisplay
|
import com.willfp.ecoarmor.display.ArmorDisplay
|
||||||
import com.willfp.ecoarmor.libreforge.ConditionIsWearingSet
|
import com.willfp.ecoarmor.libreforge.ConditionIsWearingSet
|
||||||
import com.willfp.ecoarmor.sets.*
|
import com.willfp.ecoarmor.sets.ArmorSetEquipSoundListeners
|
||||||
|
import com.willfp.ecoarmor.sets.ArmorSets
|
||||||
|
import com.willfp.ecoarmor.sets.ArmorUtils
|
||||||
|
import com.willfp.ecoarmor.sets.EffectiveDurabilityListener
|
||||||
|
import com.willfp.ecoarmor.sets.PreventSkullPlaceListener
|
||||||
import com.willfp.ecoarmor.upgrades.AdvancementShardListener
|
import com.willfp.ecoarmor.upgrades.AdvancementShardListener
|
||||||
import com.willfp.ecoarmor.upgrades.CrystalListener
|
import com.willfp.ecoarmor.upgrades.CrystalListener
|
||||||
import com.willfp.ecoarmor.upgrades.TierArgParser
|
import com.willfp.ecoarmor.upgrades.TierArgParser
|
||||||
|
|||||||
@@ -5,4 +5,4 @@ import com.willfp.ecoarmor.sets.ArmorSet
|
|||||||
interface ArmorSetEvent {
|
interface ArmorSetEvent {
|
||||||
val set: ArmorSet
|
val set: ArmorSet
|
||||||
val advanced: Boolean
|
val advanced: Boolean
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,8 +4,11 @@ import com.willfp.ecoarmor.sets.ArmorSet
|
|||||||
import org.bukkit.entity.Player
|
import org.bukkit.entity.Player
|
||||||
import org.bukkit.event.HandlerList
|
import org.bukkit.event.HandlerList
|
||||||
|
|
||||||
class PlayerArmorSetEquipEvent(who: Player, override val set: ArmorSet,
|
class PlayerArmorSetEquipEvent(
|
||||||
override val advanced: Boolean): PlayerArmorSetEvent(who, set, advanced) {
|
who: Player,
|
||||||
|
override val set: ArmorSet,
|
||||||
|
override val advanced: Boolean
|
||||||
|
) : PlayerArmorSetEvent(who, set, advanced) {
|
||||||
override fun getHandlers(): HandlerList {
|
override fun getHandlers(): HandlerList {
|
||||||
return handlerList
|
return handlerList
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,5 +4,8 @@ import com.willfp.ecoarmor.sets.ArmorSet
|
|||||||
import org.bukkit.entity.Player
|
import org.bukkit.entity.Player
|
||||||
import org.bukkit.event.player.PlayerEvent
|
import org.bukkit.event.player.PlayerEvent
|
||||||
|
|
||||||
abstract class PlayerArmorSetEvent(who: Player, override val set: ArmorSet,
|
abstract class PlayerArmorSetEvent(
|
||||||
override val advanced: Boolean): PlayerEvent(who), ArmorSetEvent
|
who: Player,
|
||||||
|
override val set: ArmorSet,
|
||||||
|
override val advanced: Boolean
|
||||||
|
) : PlayerEvent(who), ArmorSetEvent
|
||||||
|
|||||||
@@ -4,8 +4,11 @@ import com.willfp.ecoarmor.sets.ArmorSet
|
|||||||
import org.bukkit.entity.Player
|
import org.bukkit.entity.Player
|
||||||
import org.bukkit.event.HandlerList
|
import org.bukkit.event.HandlerList
|
||||||
|
|
||||||
class PlayerArmorSetUnequipEvent(who: Player, override val set: ArmorSet,
|
class PlayerArmorSetUnequipEvent(
|
||||||
override val advanced: Boolean): PlayerArmorSetEvent(who, set, advanced) {
|
who: Player,
|
||||||
|
override val set: ArmorSet,
|
||||||
|
override val advanced: Boolean
|
||||||
|
) : PlayerArmorSetEvent(who, set, advanced) {
|
||||||
override fun getHandlers(): HandlerList {
|
override fun getHandlers(): HandlerList {
|
||||||
return handlerList
|
return handlerList
|
||||||
}
|
}
|
||||||
@@ -18,4 +21,4 @@ class PlayerArmorSetUnequipEvent(who: Player, override val set: ArmorSet,
|
|||||||
return handlerList
|
return handlerList
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.willfp.ecoarmor.api
|
package com.willfp.ecoarmor.sets
|
||||||
|
|
||||||
import com.willfp.eco.core.events.ArmorChangeEvent
|
import com.willfp.eco.core.events.ArmorChangeEvent
|
||||||
import com.willfp.ecoarmor.api.event.PlayerArmorSetEquipEvent
|
import com.willfp.ecoarmor.api.event.PlayerArmorSetEquipEvent
|
||||||
@@ -8,7 +8,8 @@ import org.bukkit.Bukkit
|
|||||||
import org.bukkit.event.EventHandler
|
import org.bukkit.event.EventHandler
|
||||||
import org.bukkit.event.Listener
|
import org.bukkit.event.Listener
|
||||||
|
|
||||||
class PlayerArmorSetEventListeners: Listener {
|
class PlayerArmorSetEventListeners : Listener {
|
||||||
|
// disgusting
|
||||||
@EventHandler
|
@EventHandler
|
||||||
fun handle(event: ArmorChangeEvent) {
|
fun handle(event: ArmorChangeEvent) {
|
||||||
val setBefore = ArmorUtils.getSetOn(event.before)
|
val setBefore = ArmorUtils.getSetOn(event.before)
|
||||||
@@ -16,7 +17,9 @@ class PlayerArmorSetEventListeners: Listener {
|
|||||||
val setAfter = ArmorUtils.getSetOn(event.after)
|
val setAfter = ArmorUtils.getSetOn(event.after)
|
||||||
val advancedAfter = ArmorUtils.isWearingAdvanced(event.after)
|
val advancedAfter = ArmorUtils.isWearingAdvanced(event.after)
|
||||||
|
|
||||||
if (setBefore == setAfter && advancedBefore == advancedAfter) return
|
if (setBefore == setAfter && advancedBefore == advancedAfter) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if (setBefore != null) {
|
if (setBefore != null) {
|
||||||
Bukkit.getPluginManager().callEvent(
|
Bukkit.getPluginManager().callEvent(
|
||||||
@@ -30,4 +33,4 @@ class PlayerArmorSetEventListeners: Listener {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user