Restructure event package

By separating event base classes from specific implementations, we'll be able to re-use abstract components in a modular fashion. This change results in the following: * `io.luna.event` package that contains all event abstractions that are not tied to game logic. * `io.luna.game.events` package that contains specific implementations of those abstractions solely used for game logic. Contributes to luna-rs#180
notjuanortiz · Mar 27, 2020 · c1d3c76 · c1d3c76
1 parent f33dc1e
commit c1d3c76
Show file tree

Hide file tree

Showing 129 changed files with 198 additions and 223 deletions.
diff --git a/plugins/api/event/DuplicateMatchException.kt b/plugins/api/event/DuplicateMatchException.kt
@@ -1,6 +1,6 @@
 package api.event
 
-import io.luna.game.event.Event
+import io.luna.event.Event
 import javax.script.ScriptException
 import kotlin.reflect.KClass
 

diff --git a/plugins/api/event/InterceptBy.kt b/plugins/api/event/InterceptBy.kt
@@ -1,7 +1,7 @@
 package api.event
 
 import api.predef.*
-import io.luna.game.event.Event
+import io.luna.event.Event
 import javax.script.ScriptException
 import kotlin.reflect.KClass
 

diff --git a/plugins/api/event/InterceptFilter.kt b/plugins/api/event/InterceptFilter.kt
@@ -1,8 +1,8 @@
 package api.event
 
 import api.predef.*
-import io.luna.game.event.Event
-import io.luna.game.event.EventListener
+import io.luna.event.Event
+import io.luna.event.EventListener
 import kotlin.reflect.KClass
 
 /**
@@ -12,8 +12,8 @@ import kotlin.reflect.KClass
  * @author lare96
  */
 class InterceptFilter<E : Event>(private val eventType: KClass<E>,
-                                 private val condition: E.() -> Boolean,
-                                 private val testValue: Boolean) {
+                                                                  private val condition: E.() -> Boolean,
+                                                                  private val testValue: Boolean) {
 
     /**
      * Test condition, and run if satisfied!

diff --git a/plugins/api/event/InterceptMatcher.kt b/plugins/api/event/InterceptMatcher.kt
@@ -1,6 +1,6 @@
 package api.event
 
-import io.luna.game.event.Event
+import io.luna.event.Event
 import kotlin.reflect.KClass
 
 /**

diff --git a/plugins/api/event/InterceptUseItem.kt b/plugins/api/event/InterceptUseItem.kt
@@ -1,7 +1,7 @@
 package api.event
 
-import io.luna.game.event.impl.ItemOnItemEvent
-import io.luna.game.event.impl.ItemOnObjectEvent
+import io.luna.game.events.ItemOnItemEvent
+import io.luna.game.events.ItemOnObjectEvent
 
 /**
  * A model that intercepts [ItemOnItemEvent]s and [ItemOnObjectEvent]s.

diff --git a/plugins/api/event/Matcher.kt b/plugins/api/event/Matcher.kt
@@ -1,19 +1,19 @@
 package api.event
 
 import api.predef.*
-import io.luna.game.event.Event
-import io.luna.game.event.EventMatcher
-import io.luna.game.event.EventMatcherListener
-import io.luna.game.event.impl.ButtonClickEvent
-import io.luna.game.event.impl.CommandEvent
-import io.luna.game.event.impl.ItemClickEvent
-import io.luna.game.event.impl.ItemClickEvent.*
-import io.luna.game.event.impl.ItemOnItemEvent
-import io.luna.game.event.impl.ItemOnObjectEvent
-import io.luna.game.event.impl.NpcClickEvent
-import io.luna.game.event.impl.NpcClickEvent.*
-import io.luna.game.event.impl.ObjectClickEvent
-import io.luna.game.event.impl.ObjectClickEvent.*
+import io.luna.event.Event
+import io.luna.event.EventMatcher
+import io.luna.event.EventMatcherListener
+import io.luna.game.events.ButtonClickEvent
+import io.luna.game.events.CommandEvent
+import io.luna.game.events.ItemClickEvent
+import io.luna.game.events.ItemClickEvent.*
+import io.luna.game.events.ItemOnItemEvent
+import io.luna.game.events.ItemOnObjectEvent
+import io.luna.game.events.NpcClickEvent
+import io.luna.game.events.NpcClickEvent.*
+import io.luna.game.events.ObjectClickEvent
+import io.luna.game.events.ObjectClickEvent.*
 import kotlin.reflect.KClass
 
 /**

diff --git a/plugins/api/predef/EventPredef.kt b/plugins/api/predef/EventPredef.kt
@@ -3,15 +3,15 @@ package api.predef
 import api.event.InterceptBy
 import api.event.InterceptUseItem
 import api.event.Matcher
-import io.luna.game.event.Event
-import io.luna.game.event.EventListener
-import io.luna.game.event.impl.ButtonClickEvent
-import io.luna.game.event.impl.CommandEvent
-import io.luna.game.event.impl.ItemClickEvent.*
-import io.luna.game.event.impl.ItemOnItemEvent
-import io.luna.game.event.impl.ItemOnObjectEvent
-import io.luna.game.event.impl.NpcClickEvent.*
-import io.luna.game.event.impl.ObjectClickEvent.*
+import io.luna.event.Event
+import io.luna.event.EventListener
+import io.luna.game.events.ButtonClickEvent
+import io.luna.game.events.CommandEvent
+import io.luna.game.events.ItemClickEvent.*
+import io.luna.game.events.ItemOnItemEvent
+import io.luna.game.events.ItemOnObjectEvent
+import io.luna.game.events.NpcClickEvent.*
+import io.luna.game.events.ObjectClickEvent.*
 import io.luna.game.model.mob.PlayerRights
 import java.util.*
 import kotlin.reflect.KClass

diff --git a/plugins/api/predef/PropertiesPredef.kt b/plugins/api/predef/PropertiesPredef.kt
@@ -1,7 +1,7 @@
 package api.predef
 
-import io.luna.game.event.EventListener
-import io.luna.game.event.EventMatcherListener
+import io.luna.event.EventListener
+import io.luna.event.EventMatcherListener
 import io.luna.game.model.EntityType
 import io.luna.game.model.item.Equipment
 import io.luna.game.model.item.Item

diff --git a/plugins/api/shop/OpenReceiver.kt b/plugins/api/shop/OpenReceiver.kt
@@ -1,7 +1,7 @@
 package api.shop
 
 import api.predef.*
-import io.luna.game.event.impl.PlayerEvent
+import io.luna.game.events.PlayerEvent
 import io.luna.game.model.item.shop.Shop
 import io.luna.game.model.item.shop.ShopInterface
 

diff --git a/plugins/world/areas/wilderness/registerWilderness.kts b/plugins/world/areas/wilderness/registerWilderness.kts
@@ -1,7 +1,6 @@
 package world.areas.wilderness
 
 import api.predef.*
-import io.luna.game.event.impl.ServerLaunchEvent
 
 /**
  * Register miscellaneous wilderness areas here.

diff --git a/plugins/world/npc/death/dropItems/dropNpcItems.kts b/plugins/world/npc/death/dropItems/dropNpcItems.kts
@@ -1,7 +1,6 @@
 package world.npc.death.dropItems
 
 import api.predef.*
-import io.luna.game.event.impl.NpcDeathEvent
 
 on(NpcDeathEvent::class) {
     // TODO Npc Drops.

diff --git a/plugins/world/npc/makeOver/makeOver.kts b/plugins/world/npc/makeOver/makeOver.kts
@@ -1,7 +1,6 @@
 package world.npc.makeOver
 
 import api.predef.*
-import io.luna.game.event.impl.ServerLaunchEvent
 import io.luna.game.model.mob.PlayerAppearance
 
 /**

diff --git a/plugins/world/npc/shop/generalStore/generalStore.kts b/plugins/world/npc/shop/generalStore/generalStore.kts
@@ -1,7 +1,6 @@
 package world.npc.shop.generalStore
 
 import api.predef.*
-import io.luna.game.event.impl.ServerLaunchEvent
 import io.luna.game.model.item.shop.BuyPolicy
 import io.luna.game.model.item.shop.Currency
 import io.luna.game.model.item.shop.RestockPolicy

diff --git a/plugins/world/player/advanceLevel/advanceLevel.kts b/plugins/world/player/advanceLevel/advanceLevel.kts
@@ -1,12 +1,10 @@
 package world.player.advanceLevel
 
 import api.predef.*
-import io.luna.game.event.impl.SkillChangeEvent
 import io.luna.game.model.mob.Graphic
 import io.luna.game.model.mob.Player
 import io.luna.game.model.mob.Skill
 import io.luna.game.model.mob.block.UpdateFlagSet.UpdateFlag
-import io.luna.net.msg.out.SkillUpdateMessageWriter
 
 /**
  * Graphic played when a player advances a level.

diff --git a/plugins/world/player/announcements/announcements.kts b/plugins/world/player/announcements/announcements.kts
@@ -1,7 +1,6 @@
 package world.player.announcements
 
 import api.predef.*
-import io.luna.game.event.impl.ServerLaunchEvent
 
 /**
  * Announcement broadcast interval.

diff --git a/plugins/world/player/command/CommandHandler.kt b/plugins/world/player/command/CommandHandler.kt
@@ -2,7 +2,7 @@ package world.player.command
 
 import api.event.Matcher
 import api.predef.*
-import io.luna.game.event.impl.CommandEvent
+import io.luna.game.events.CommandEvent
 import io.luna.game.model.mob.Player
 import io.luna.game.model.mob.PlayerRights
 

diff --git a/plugins/world/player/command/generic/playerCmd.kts b/plugins/world/player/command/generic/playerCmd.kts
@@ -4,7 +4,7 @@ import api.event.Matcher
 import api.inter.QuestJournalInterface
 import api.predef.*
 import com.google.common.collect.HashMultimap
-import io.luna.game.event.impl.CommandEvent
+import io.luna.game.events.CommandEvent
 import io.luna.game.model.mob.Player
 import io.luna.game.model.mob.PlayerRights
 import io.luna.game.model.mob.inter.NameInputInterface

diff --git a/plugins/world/player/command/punishment/punishmentCmd.kts b/plugins/world/player/command/punishment/punishmentCmd.kts
@@ -2,7 +2,7 @@ package world.player.command.punishment
 
 import api.predef.*
 import api.punishment.PunishmentHandler
-import io.luna.game.event.impl.CommandEvent
+import io.luna.game.events.CommandEvent
 import world.player.command.cmd
 import world.player.command.getPlayer
 import java.time.LocalDateTime

diff --git a/plugins/world/player/command/searchItem/findItemCmd.kts b/plugins/world/player/command/searchItem/findItemCmd.kts
@@ -1,8 +1,7 @@
 package world.player.command.searchItem
 
 import api.predef.*
-import io.luna.game.event.impl.WidgetItemClickEvent
-import io.luna.game.event.impl.WidgetItemClickEvent.*
+import io.luna.game.events.WidgetItemClickEvent.*
 import io.luna.game.model.item.Item
 import io.luna.game.model.mob.Player
 import io.luna.game.model.mob.inter.AmountInputInterface

diff --git a/plugins/world/player/command/setSkill/setSkill.kts b/plugins/world/player/command/setSkill/setSkill.kts
@@ -1,7 +1,6 @@
 package world.player.command.setSkill
 
 import api.predef.*
-import io.luna.game.event.impl.ButtonClickEvent
 import io.luna.game.model.mob.inter.AbstractInterfaceSet
 import world.player.command.cmd
 

diff --git a/plugins/world/player/death/dropItems/dropPlayerItems.kts b/plugins/world/player/death/dropItems/dropPlayerItems.kts
@@ -1,7 +1,7 @@
 package world.player.death.dropItems
 
 import api.predef.*
-import io.luna.game.event.impl.PlayerDeathEvent
+import io.luna.game.events.PlayerDeathEvent
 import io.luna.game.model.EntityType
 import io.luna.game.model.item.Item
 import io.luna.game.model.item.ItemContainer

diff --git a/plugins/world/player/emote/performEmote.kts b/plugins/world/player/emote/performEmote.kts
@@ -1,7 +1,6 @@
 package world.player.emote
 
 import api.predef.*
-import io.luna.game.event.impl.ButtonClickEvent
 import io.luna.game.model.mob.Animation
 import io.luna.game.model.mob.Player
 

diff --git a/plugins/world/player/inter/clickOption/clickOption.kts b/plugins/world/player/inter/clickOption/clickOption.kts
@@ -1,7 +1,6 @@
 package world.player.inter.clickOption
 
 import api.predef.*
-import io.luna.game.event.impl.ButtonClickEvent
 import io.luna.game.model.mob.dialogue.OptionDialogueInterface
 
 /**

diff --git a/plugins/world/player/inter/makeItem/makeItem.kts b/plugins/world/player/inter/makeItem/makeItem.kts
@@ -1,7 +1,6 @@
 package world.player.inter.makeItem
 
 import api.predef.*
-import io.luna.game.event.impl.ButtonClickEvent
 import io.luna.game.model.mob.dialogue.MakeItemDialogueInterface
 
 /**

diff --git a/plugins/world/player/item/banking/depositBox/depositBoxInput.kts b/plugins/world/player/item/banking/depositBox/depositBoxInput.kts
@@ -1,7 +1,6 @@
 package world.player.item.banking.depositBox
 
 import api.predef.*
-import io.luna.game.event.impl.WidgetItemClickEvent
 import io.luna.game.model.mob.Player
 import io.luna.game.model.mob.inter.AmountInputInterface
 

diff --git a/plugins/world/player/item/banking/depositBox/openDepositBox.kts b/plugins/world/player/item/banking/depositBox/openDepositBox.kts
@@ -1,7 +1,7 @@
 package world.player.item.banking.depositBox
 
 import api.predef.*
-import io.luna.game.event.impl.ObjectClickEvent.ObjectFirstClickEvent
+import io.luna.game.events.ObjectClickEvent.ObjectFirstClickEvent
 
 /**
  * A set of deposit boxes.

diff --git a/plugins/world/player/item/banking/regularBank/bankInput.kts b/plugins/world/player/item/banking/regularBank/bankInput.kts
@@ -1,8 +1,7 @@
 package world.player.item.banking.regularBank
 
 import api.predef.*
-import io.luna.game.event.impl.WidgetItemClickEvent
-import io.luna.game.event.impl.WidgetItemClickEvent.*
+import io.luna.game.events.WidgetItemClickEvent.*
 import io.luna.game.model.mob.Player
 import io.luna.game.model.mob.inter.AmountInputInterface
 

diff --git a/plugins/world/player/item/banking/regularBank/openBank.kts b/plugins/world/player/item/banking/regularBank/openBank.kts
@@ -1,7 +1,7 @@
 package world.player.item.banking.regularBank
 
 import api.predef.*
-import io.luna.game.event.impl.ObjectClickEvent.ObjectFirstClickEvent
+import io.luna.game.events.ObjectClickEvent.ObjectFirstClickEvent
 
 /**
  * A set of banking objects.

diff --git a/plugins/world/player/item/equipment/equipmentChange.kts b/plugins/world/player/item/equipment/equipmentChange.kts
@@ -1,8 +1,7 @@
 package world.player.item.equipment
 
 import api.predef.*
-import io.luna.game.event.impl.EquipItemEvent
-import io.luna.game.event.impl.WidgetItemClickEvent.WidgetItemFirstClickEvent
+import io.luna.game.events.WidgetItemClickEvent.WidgetItemFirstClickEvent
 import io.luna.game.model.mob.Player
 
 /**

diff --git a/plugins/world/player/item/shops/itemValue.kts b/plugins/world/player/item/shops/itemValue.kts
@@ -1,7 +1,7 @@
 package world.player.item.shops
 
 import api.predef.*
-import io.luna.game.event.impl.WidgetItemClickEvent.WidgetItemFirstClickEvent
+import io.luna.game.events.WidgetItemClickEvent.WidgetItemFirstClickEvent
 import io.luna.game.model.item.shop.Shop
 import io.luna.game.model.item.shop.ShopInterface
 import io.luna.game.model.mob.Player

diff --git a/plugins/world/player/item/shops/shopChange.kts b/plugins/world/player/item/shops/shopChange.kts
@@ -1,8 +1,8 @@
 package world.player.item.shops
 
 import api.predef.*
-import io.luna.game.event.impl.WidgetItemClickEvent
-import io.luna.game.event.impl.WidgetItemClickEvent.*
+import io.luna.game.events.WidgetItemClickEvent
+import io.luna.game.events.WidgetItemClickEvent.*
 import io.luna.game.model.item.shop.ShopInterface
 
 /**

diff --git a/plugins/world/player/item/trading/request/requestTrade.kts b/plugins/world/player/item/trading/request/requestTrade.kts
@@ -1,7 +1,7 @@
 package world.player.item.trading.request
 
 import api.predef.*
-import io.luna.game.event.impl.PlayerClickEvent.PlayerFourthClickEvent
+import io.luna.game.events.PlayerClickEvent.PlayerFourthClickEvent
 import io.luna.game.model.mob.Player
 
 /**

diff --git a/plugins/world/player/item/trading/tradeScreen/offerItem.kts b/plugins/world/player/item/trading/tradeScreen/offerItem.kts
@@ -1,8 +1,7 @@
 package world.player.item.trading.tradeScreen
 
 import api.predef.*
-import io.luna.game.event.impl.WidgetItemClickEvent
-import io.luna.game.event.impl.WidgetItemClickEvent.*
+import io.luna.game.events.WidgetItemClickEvent.*
 import io.luna.game.model.mob.Player
 import io.luna.game.model.mob.inter.AmountInputInterface
 

diff --git a/plugins/world/player/login/init/initPlayer.kts b/plugins/world/player/login/init/initPlayer.kts
@@ -3,7 +3,7 @@ package world.player.login.init
 import api.predef.*
 import api.punishment.PunishmentHandler
 import io.luna.Luna
-import io.luna.game.event.impl.LoginEvent
+import io.luna.game.events.LoginEvent
 import io.luna.game.model.mob.Player
 import io.luna.net.msg.out.AssignmentMessageWriter
 import io.luna.net.msg.out.SkillUpdateMessageWriter

diff --git a/plugins/world/player/login/starterPackage/starterPackage.kts b/plugins/world/player/login/starterPackage/starterPackage.kts
@@ -1,7 +1,7 @@
 package world.player.login.starterPackage
 
 import api.predef.*
-import io.luna.game.event.impl.LoginEvent
+import io.luna.game.events.LoginEvent
 import io.luna.game.model.item.Item
 import io.luna.game.model.mob.Player
 import io.luna.game.model.mob.PlayerAppearance.DesignPlayerInterface

diff --git a/plugins/world/player/obj/resource/Resource.kt b/plugins/world/player/obj/resource/Resource.kt
@@ -1,7 +1,7 @@
 package world.player.obj.resource
 
 import api.predef.*
-import io.luna.game.event.impl.ItemOnObjectEvent
+import io.luna.game.events.ItemOnObjectEvent
 import io.luna.game.model.def.ObjectDefinition
 import io.luna.game.model.item.Item
 import io.luna.game.model.mob.Player

diff --git a/plugins/world/player/obj/restorePrayer/restorePrayer.kts b/plugins/world/player/obj/restorePrayer/restorePrayer.kts
@@ -1,7 +1,7 @@
 package world.player.obj.restorePrayer
 
 import api.predef.*
-import io.luna.game.event.impl.ObjectClickEvent.ObjectFirstClickEvent
+import io.luna.game.events.ObjectClickEvent.ObjectFirstClickEvent
 import io.luna.game.model.mob.Animation
 import io.luna.game.model.mob.Player
 

diff --git a/plugins/world/player/privateChat/chat.kts b/plugins/world/player/privateChat/chat.kts
@@ -1,7 +1,7 @@
 package world.player.privateChat
 
 import api.predef.*
-import io.luna.game.event.impl.PrivateChatEvent
+import io.luna.game.events.PrivateChatEvent
 import io.luna.game.model.mob.Player
 import io.luna.net.msg.out.PrivateChatMessageWriter