Move region events into their own file

gabber235 · Jan 13, 2025 · c293862 · c293862
1 parent 8bc40da
commit c293862
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 40 deletions.
diff --git a/...ions/WorldGuardExtension/src/main/kotlin/com/typewritermc/worldguard/WorldGuardHandler.kt b/...ions/WorldGuardExtension/src/main/kotlin/com/typewritermc/worldguard/WorldGuardHandler.kt
@@ -7,11 +7,9 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion
 import com.sk89q.worldguard.session.MoveType
 import com.sk89q.worldguard.session.Session
 import com.sk89q.worldguard.session.handler.Handler
+import com.typewritermc.worldguard.events.RegionsEnterEvent
+import com.typewritermc.worldguard.events.RegionsExitEvent
 import lirand.api.extensions.server.server
-import org.bukkit.entity.Player
-import org.bukkit.event.Event
-import org.bukkit.event.HandlerList
-import org.bukkit.event.player.PlayerEvent
 
 class WorldGuardHandler(session: Session?) : Handler(session) {
 
@@ -42,32 +40,4 @@ class WorldGuardHandler(session: Session?) : Handler(session) {
 
         return super.onCrossBoundary(player, from, to, toSet, entered, exited, moveType)
     }
-}
-
-class RegionsEnterEvent(player: Player, val regions: Set<ProtectedRegion>) : PlayerEvent(player) {
-    operator fun contains(regionName: String) = regions.any { it.id == regionName }
-
-    override fun getHandlers(): HandlerList = HANDLER_LIST
-
-    companion object {
-        @JvmStatic
-        val HANDLER_LIST = HandlerList()
-
-        @JvmStatic
-        fun getHandlerList(): HandlerList = HANDLER_LIST
-    }
-}
-
-class RegionsExitEvent(player: Player, val regions: Set<ProtectedRegion>) : PlayerEvent(player) {
-    operator fun contains(regionName: String) = regions.any { it.id == regionName }
-
-    override fun getHandlers(): HandlerList = HANDLER_LIST
-
-    companion object {
-        @JvmStatic
-        val HANDLER_LIST = HandlerList()
-
-        @JvmStatic
-        fun getHandlerList(): HandlerList = HANDLER_LIST
-    }
 }
diff --git a/...nsion/src/main/kotlin/com/typewritermc/worldguard/entries/audience/RegionAudienceEntry.kt b/...nsion/src/main/kotlin/com/typewritermc/worldguard/entries/audience/RegionAudienceEntry.kt
@@ -10,8 +10,8 @@ import com.typewritermc.engine.paper.entry.entries.AudienceEntry
 import com.typewritermc.engine.paper.entry.entries.AudienceFilter
 import com.typewritermc.engine.paper.entry.entries.AudienceFilterEntry
 import com.typewritermc.engine.paper.entry.entries.Invertible
-import com.typewritermc.worldguard.RegionsEnterEvent
-import com.typewritermc.worldguard.RegionsExitEvent
+import com.typewritermc.worldguard.events.RegionsEnterEvent
+import com.typewritermc.worldguard.events.RegionsExitEvent
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 

diff --git a/...ension/src/main/kotlin/com/typewritermc/worldguard/entries/event/EnterRegionEventEntry.kt b/...ension/src/main/kotlin/com/typewritermc/worldguard/entries/event/EnterRegionEventEntry.kt
@@ -10,8 +10,7 @@ import com.typewritermc.core.interaction.context
 import com.typewritermc.engine.paper.entry.TriggerableEntry
 import com.typewritermc.engine.paper.entry.entries.EventEntry
 import com.typewritermc.engine.paper.entry.triggerAllFor
-import com.typewritermc.worldguard.RegionsEnterEvent
-import lirand.api.extensions.server.server
+import com.typewritermc.worldguard.events.RegionsEnterEvent
 
 @Entry("on_enter_region", "When a player enters a WorldGuard region", Colors.YELLOW, "fa6-solid:door-open")
 /**

diff --git a/...tension/src/main/kotlin/com/typewritermc/worldguard/entries/event/ExitRegionEventEntry.kt b/...tension/src/main/kotlin/com/typewritermc/worldguard/entries/event/ExitRegionEventEntry.kt
@@ -10,8 +10,7 @@ import com.typewritermc.core.interaction.context
 import com.typewritermc.engine.paper.entry.TriggerableEntry
 import com.typewritermc.engine.paper.entry.entries.EventEntry
 import com.typewritermc.engine.paper.entry.triggerAllFor
-import com.typewritermc.worldguard.RegionsExitEvent
-import lirand.api.extensions.server.server
+import com.typewritermc.worldguard.events.RegionsExitEvent
 
 @Entry("on_exit_region", "When a player exits a WorldGuard region", Colors.YELLOW, "fa6-solid:door-closed")
 /**

diff --git a/...rldGuardExtension/src/main/kotlin/com/typewritermc/worldguard/events/RegionsEnterEvent.kt b/...rldGuardExtension/src/main/kotlin/com/typewritermc/worldguard/events/RegionsEnterEvent.kt
@@ -1,4 +1,4 @@
-package com.typewritermc.worldguard
+package com.typewritermc.worldguard.events
 
 import com.sk89q.worldguard.protection.regions.ProtectedRegion
 import org.bukkit.entity.Player

diff --git a/...orldGuardExtension/src/main/kotlin/com/typewritermc/worldguard/events/RegionsExitEvent.kt b/...orldGuardExtension/src/main/kotlin/com/typewritermc/worldguard/events/RegionsExitEvent.kt
@@ -1,4 +1,4 @@
-package com.typewritermc.worldguard
+package com.typewritermc.worldguard.events
 
 import com.sk89q.worldguard.protection.regions.ProtectedRegion
 import org.bukkit.entity.Player