#486 Moved events to simplified structure.

blockball-api/src/main/java/com/github/shynixn/blockball/api/business/enumeration/PlaceHolder.kt

@@ -1,32 +1,5 @@
 package com.github.shynixn.blockball.api.business.enumeration
 
-/**
- * Placeholder being used in BlockBall.
- * <p>
- * Version 1.2
- * <p>
- * MIT License
- * <p>
- * Copyright (c) 2018 by Shynixn
- * <p>
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * <p>
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * <p>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 enum class PlaceHolder(
     /**
      * Placeholder value.

blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/BlockBallDependencyInjectionBinder.kt

@@ -51,7 +51,6 @@ class BlockBallDependencyInjectionBinder(
         // Services
         bind(PacketService::class.java).toInstance(packetService)
         bind(EntityService::class.java).toInstance(EntityServiceImpl())
-        bind(EventService::class.java).to(EventServiceImpl::class.java).`in`(Scopes.SINGLETON)
         bind(TemplateService::class.java).to(TemplateServiceImpl::class.java).`in`(Scopes.SINGLETON)
         bind(VirtualArenaService::class.java).to(VirtualArenaServiceImpl::class.java).`in`(Scopes.SINGLETON)
         bind(ScoreboardService::class.java).to(ScoreboardServiceImpl::class.java).`in`(Scopes.SINGLETON)

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/BallEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/BallEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.business.proxy.BallProxy
 

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/BallKickEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/BallLeftClickEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.business.proxy.BallProxy
 import org.bukkit.entity.Player
@@ -7,8 +7,8 @@ import org.bukkit.util.Vector
 /**
  * Event which gets called when the ball is kicked.
  */
-class BallKickEvent(
+class BallLeftClickEvent(
     ball: BallProxy,
     player: Player,
     velocity: Vector
-) : BallTouchEvent(ball, player, velocity)
+) : BallTouchPlayerEvent(ball, player, velocity)

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/BallRayTraceEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/BallRayTraceEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.business.enumeration.BlockDirection
 import com.github.shynixn.blockball.api.business.proxy.BallProxy

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/BallDeathEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/BallRemoveEvent.kt

@@ -1,8 +1,8 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.business.proxy.BallProxy
 
 /**
  * Event which gets sent when the ball is requested to get removed.
  */
-class BallDeathEvent(ball: BallProxy) : BallEvent(ball)
+class BallRemoveEvent(ball: BallProxy) : BallEvent(ball)

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/BallPassEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/BallRightClickEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.business.proxy.BallProxy
 import org.bukkit.entity.Player
@@ -7,8 +7,8 @@ import org.bukkit.util.Vector
 /**
  * Event which gets called when the ball is passed.
  */
-class BallPassEvent(
+class BallRightClickEvent(
     ball: BallProxy,
     player: Player,
     velocity: Vector
-) : BallTouchEvent(ball, player, velocity)
+) : BallTouchPlayerEvent(ball, player, velocity)

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/BallSpawnEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/BallSpawnEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.business.proxy.BallProxy
 

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/BallTeleportEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/BallTeleportEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.business.proxy.BallProxy
 import org.bukkit.Location

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/BallTouchEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/BallTouchPlayerEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.business.proxy.BallProxy
 import org.bukkit.entity.Player
@@ -8,7 +8,7 @@ import org.bukkit.util.Vector
 /**
  * Event which gets called when the ball is touched.
  */
-open class BallTouchEvent(
+open class BallTouchPlayerEvent(
     ball: BallProxy,
     /**
      * Interacting player.

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/BlockBallEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/BlockBallEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import org.bukkit.event.Cancellable
 import org.bukkit.event.Event

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/GameEndEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/GameEndEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.business.enumeration.Team
 import com.github.shynixn.blockball.api.persistence.entity.Game

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/GameEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/GameEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.persistence.entity.Game
 

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/GameGoalEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/GameGoalEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.business.enumeration.Team
 import com.github.shynixn.blockball.api.persistence.entity.Game

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/GameJoinEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/GameJoinEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.persistence.entity.Game
 import org.bukkit.entity.Player

blockball-bukkit-api/src/main/java/com/github/shynixn/blockball/api/bukkit/event/GameLeaveEvent.kt → blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/event/GameLeaveEvent.kt

@@ -1,4 +1,4 @@
-package com.github.shynixn.blockball.api.bukkit.event
+package com.github.shynixn.blockball.event
 
 import com.github.shynixn.blockball.api.persistence.entity.Game
 import org.bukkit.entity.Player

blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/impl/AllPlayerTracker.kt

@@ -2,21 +2,22 @@ package com.github.shynixn.blockball.impl
 
 import com.github.shynixn.blockball.api.business.service.ProxyService
 import com.github.shynixn.blockball.api.persistence.entity.Position
+import org.bukkit.entity.Player
 
 class AllPlayerTracker(
     private val locationFunction: () -> Position,
-    private val newPlayerFunction: (Any) -> Unit,
-    private val oldPlayerFunction: (Any) -> Unit,
-    private val filterPlayerFunction: (Any) -> Boolean = { true }
+    private val newPlayerFunction: (Player) -> Unit,
+    private val oldPlayerFunction: (Player) -> Unit,
+    private val filterPlayerFunction: (Player) -> Boolean = { true }
 ) {
-    private val cache = HashSet<Any>()
+    private val cache = HashSet<Player>()
     lateinit var proxyService: ProxyService
 
     /**
-     * Checks the players inthe world and returns the interesing ones.
+     * Checks the players in the world and returns the interesting ones.
      */
-    fun checkAndGet(): List<Any> {
-        val players = proxyService.getPlayersInWorld<Any, Any>(locationFunction.invoke()).toMutableList()
+    fun checkAndGet(): List<Player> {
+        val players = proxyService.getPlayersInWorld<Player, Any>(locationFunction.invoke()).toMutableList()
 
         for (player in players.toTypedArray()) {
             if (!filterPlayerFunction.invoke(player)) {