Add packages to plugins

game/plugin/api/src/definitions.kt

@@ -1,4 +1,4 @@
-package org.apollo.game.plugins.api
+package org.apollo.game.plugin.api
 
 import org.apollo.cache.def.ItemDefinition
 import org.apollo.cache.def.NpcDefinition

game/plugin/api/src/util.kt

@@ -1,4 +1,6 @@
-import java.util.*
+package org.apollo.game.plugin.api
+
+import java.util.Random
 
 val RAND = Random()
 

game/plugin/api/src/world.kt

@@ -1,3 +1,5 @@
+package org.apollo.game.plugin.api
+
 import org.apollo.game.model.Position
 import org.apollo.game.model.World
 import org.apollo.game.model.area.Region
@@ -7,21 +9,17 @@ import org.apollo.game.model.entity.EntityType.DYNAMIC_OBJECT
 import org.apollo.game.model.entity.EntityType.STATIC_OBJECT
 import org.apollo.game.model.entity.obj.DynamicGameObject
 import org.apollo.game.model.entity.obj.GameObject
-import org.apollo.game.model.entity.obj.StaticGameObject
 import org.apollo.game.scheduling.ScheduledTask
-import java.lang.IllegalArgumentException
+import java.util.Optional
-import java.util.*
 import java.util.stream.Stream
 
-fun <T : Entity> Region.find(position: Position, pred: (T) -> Boolean, vararg types: EntityType): Stream<T> {
+fun <T : Entity> Region.find(position: Position, predicate: (T) -> Boolean, vararg types: EntityType): Stream<T> {
-    val result = this.getEntities<T>(position, *types)
+    val result = getEntities<T>(position, *types)
-
+    return result.stream().filter(predicate::invoke)
-    return result.stream()
-            .filter(pred::invoke)
 }
 
 fun Region.findObjects(position: Position, id: Int): Stream<GameObject> {
-    return find<GameObject>(position, { it.id == id }, DYNAMIC_OBJECT, STATIC_OBJECT)
+    return find(position, { it.id == id }, DYNAMIC_OBJECT, STATIC_OBJECT)
 }
 
 fun Region.findObject(position: Position, id: Int): Optional<GameObject> {
@@ -30,16 +28,16 @@ fun Region.findObject(position: Position, id: Int): Optional<GameObject> {
 }
 
 class ExpireObjectTask(
-        val world: World,
+    private val world: World,
-        val obj: GameObject,
+    private val existing: GameObject,
-        val replacement: GameObject,
+    private val replacement: GameObject,
-        val respawnDelay: Int
+    private val respawnDelay: Int
 ) : ScheduledTask(0, true) {
 
     private var respawning: Boolean = false
 
     override fun execute() {
-        val region = world.regionRepository.fromPosition(obj.position)
+        val region = world.regionRepository.fromPosition(existing.position)
 
         if (!respawning) {
             world.spawn(replacement)
@@ -47,7 +45,7 @@ class ExpireObjectTask(
             setDelay(respawnDelay)
         } else {
             region.removeEntity(replacement)
-            world.spawn(obj)
+            world.spawn(existing)
             stop()
         }
     }
@@ -55,7 +53,6 @@ class ExpireObjectTask(
 
 fun World.expireObject(obj: GameObject, replacement: Int, respawnDelay: Int) {
     val replacementObj = DynamicGameObject.createPublic(this, replacement, obj.position, obj.type, obj.orientation)
-    val respawnedObj = DynamicGameObject.createPublic(this, obj.id, obj.position, obj.type, obj.orientation)
 
     schedule(ExpireObjectTask(this, obj, replacementObj, respawnDelay))
 }

game/plugin/cmd/src/animate-cmd.plugin.kts

@@ -1,11 +1,12 @@
 import com.google.common.primitives.Ints
 import org.apollo.game.model.Animation
 import org.apollo.game.model.entity.setting.PrivilegeLevel
+import org.apollo.game.plugin.util.command.valid_arg_length
 
 on_command("animate", PrivilegeLevel.MODERATOR)
     .then { player ->
         val invalidSyntax = "Invalid syntax - ::animate [animation-id]"
-            if(valid_arg_length(arguments, 1, player, invalidSyntax)) {
+        if (valid_arg_length(arguments, 1, player, invalidSyntax)) {
             val id = Ints.tryParse(arguments[0])
             if (id == null) {
                 player.sendMessage(invalidSyntax)

game/plugin/cmd/src/item-cmd.plugin.kts

@@ -1,6 +1,7 @@
 import com.google.common.primitives.Ints
 import org.apollo.cache.def.ItemDefinition
 import org.apollo.game.model.entity.setting.PrivilegeLevel
+import org.apollo.game.plugin.util.command.valid_arg_length
 
 on_command("item", PrivilegeLevel.ADMINISTRATOR)
     .then { player ->

game/plugin/cmd/src/lookup.plugin.kts

@@ -3,6 +3,7 @@ import org.apollo.cache.def.ItemDefinition
 import org.apollo.cache.def.NpcDefinition
 import org.apollo.cache.def.ObjectDefinition
 import org.apollo.game.model.entity.setting.PrivilegeLevel
+import org.apollo.game.plugin.util.command.valid_arg_length
 
 on_command("iteminfo", PrivilegeLevel.ADMINISTRATOR)
     .then { player ->

game/plugin/cmd/src/punish-cmd.plugin.kts

@@ -1,4 +1,3 @@
-
 import org.apollo.game.model.entity.Player
 import org.apollo.game.model.entity.setting.PrivilegeLevel
 

game/plugin/cmd/src/skill-cmd.plugin.kts

@@ -1,4 +1,3 @@
-
 import com.google.common.primitives.Doubles
 import com.google.common.primitives.Ints
 import org.apollo.game.model.entity.Skill

game/plugin/cmd/src/teleport-cmd.plugin.kts

@@ -1,6 +1,7 @@
 import com.google.common.primitives.Ints
 import org.apollo.game.model.Position
 import org.apollo.game.model.entity.setting.PrivilegeLevel
+import org.apollo.game.plugin.util.command.valid_arg_length
 
 /**
  * Sends the player's position.

game/plugin/entity/following/src/following.plugin.kts

@@ -1,9 +1,7 @@
-import com.google.common.primitives.Ints
+import org.apollo.game.plugin.entity.player_action.PlayerActionType
-import org.apollo.game.message.impl.PlayerActionMessage
-import org.apollo.game.model.entity.setting.PrivilegeLevel
 import org.apollo.plugin.entity.following.FollowAction
 
-on_player_event { PlayerActionEvent::class }
+on_player_event { org.apollo.game.plugin.entity.player_action.PlayerActionEvent::class }
     .where { action == PlayerActionType.FOLLOW }
     .then {
         FollowAction.start(it, target)

game/plugin/entity/player-action/src/player_action.kt

@@ -1,7 +1,9 @@
+package org.apollo.game.plugin.entity.player_action
+
 import org.apollo.game.message.impl.SetPlayerActionMessage
 import org.apollo.game.model.entity.Player
 import org.apollo.game.model.event.PlayerEvent
-import java.util.*
+import java.util.EnumSet
 
 enum class PlayerActionType(val displayName: String, val slot: Int, val primary: Boolean = true) {
     ATTACK("Attack", 2),

game/plugin/entity/player-action/src/player_action.plugin.kts

@@ -1,5 +1,9 @@
 import org.apollo.game.message.impl.PlayerActionMessage
 import org.apollo.game.model.event.impl.LoginEvent
+import org.apollo.game.plugin.entity.player_action.PlayerActionEvent
+import org.apollo.game.plugin.entity.player_action.PlayerActionType
+import org.apollo.game.plugin.entity.player_action.actionAt
+import org.apollo.game.plugin.entity.player_action.enableAction
 
 on { PlayerActionMessage::class }
     .then {

game/plugin/entity/spawn/src/spawn.kt

@@ -1,8 +1,12 @@
-import org.apollo.game.model.*
+package org.apollo.game.plugin.entity.spawn
+
+import org.apollo.game.model.Animation
+import org.apollo.game.model.Direction
+import org.apollo.game.model.Graphic
+import org.apollo.game.model.Position
 
 data class Spawn(val id: Int?, val name: String, val position: Position, val facing: Direction,
-                 val spawnAnimation: Animation? = null,
+                 val spawnAnimation: Animation? = null, val spawnGraphic: Graphic? = null)
-                 val spawnGraphic: Graphic? = null)
 
 object Spawns {
     val list = mutableListOf<Spawn>()

game/plugin/entity/spawn/src/spawn.plugin.kts

@@ -1,23 +1,18 @@
 import org.apollo.cache.def.NpcDefinition
 import org.apollo.game.model.entity.Npc
+import org.apollo.game.plugin.entity.spawn.Spawns
+import org.apollo.game.plugin.util.lookup.lookup_npc
 
 start { world ->
     Spawns.list.forEach {
-        val definition = if (it.id != null) NpcDefinition.lookup(it.id!!) else lookup_npc(it.name)
+        val definition = it.id?.let { NpcDefinition.lookup(it) } ?: lookup_npc(it.name) ?:
-        if (definition == null) {
             throw IllegalArgumentException("Invalid NPC name or ID ${it.name}, ${it.id}")
-        }
 
         val npc = Npc(world, definition.id, it.position)
         npc.turnTo(it.position.step(1, it.facing))
 
-        if (it.spawnAnimation != null) {
+        it.spawnAnimation?.let(npc::playAnimation)
-            npc.playAnimation(it.spawnAnimation)
+        it.spawnGraphic?.let(npc::playGraphic)
-        }
-
-        if (it.spawnGraphic != null) {
-            npc.playGraphic(it.spawnGraphic)
-        }
 
         world.register(npc)
     }

game/plugin/locations/al-kharid/src/al-kharid-npcs.plugin.kts

@@ -1,4 +1,5 @@
 import org.apollo.game.model.Direction
+import org.apollo.game.plugin.entity.spawn.npc_spawn
 
 // Generic npcs
 

game/plugin/locations/edgeville/src/edgeville-npcs.plugin.kts

@@ -1,4 +1,5 @@
 import org.apollo.game.model.Direction
+import org.apollo.game.plugin.entity.spawn.npc_spawn
 
 // Generic npcs
 

game/plugin/locations/falador/src/falador-npcs.plugin.kts

@@ -1,3 +1,4 @@
+import org.apollo.game.plugin.entity.spawn.npc_spawn
 
 // Generic npcs
 

game/plugin/locations/lumbridge/src/lumbridge-npcs.plugin.kts

@@ -1,3 +1,5 @@
+import org.apollo.game.plugin.entity.spawn.npc_spawn
+
 npc_spawn("woman", id = 4, x = 3232, y = 3207)
 npc_spawn("man", id = 1, x = 3231, y = 3237)
 npc_spawn("man", id = 2, x = 3224, y = 3240)

game/plugin/locations/tutorial-island/src/tutorial-island-npcs.plugin.kts

@@ -1,4 +1,5 @@
 import org.apollo.game.model.Direction
+import org.apollo.game.plugin.entity.spawn.npc_spawn
 
 // Functional npcs
 

game/plugin/locations/varrock/src/shops.plugin.kts

@@ -1,3 +1,5 @@
+import org.apollo.game.plugin.shops.shop
+
 shop("Aubury's Rune Shop.") {
     operated by "Aubury"
 

game/plugin/locations/varrock/src/varrock-npcs.plugin.kts

@@ -1,4 +1,5 @@
 import org.apollo.game.model.Direction
+import org.apollo.game.plugin.entity.spawn.npc_spawn
 
 npc_spawn("barbarian_woman", x = 3222, y = 3399)
 

game/plugin/navigation/door/src/door.kt

@@ -8,9 +8,9 @@ import org.apollo.game.model.entity.Player
 import org.apollo.game.model.entity.obj.DynamicGameObject
 import org.apollo.game.model.entity.obj.GameObject
 import org.apollo.game.model.event.PlayerEvent
+import org.apollo.game.plugin.api.findObject
 import org.apollo.net.message.Message
 import java.util.Objects
-import findObject
 
 enum class DoorType {
     LEFT, RIGHT, NOT_SUPPORTED
@@ -94,7 +94,8 @@ class Door(private val gameObject: GameObject) {
             val position = movePosition()
             val orientation: Int = translateDirection()?.toOrientationInteger() ?: gameObject.orientation
 
-            val toggledDoor = DynamicGameObject.createPublic(world, gameObject.id, position, gameObject.type, orientation)
+            val toggledDoor = DynamicGameObject.createPublic(world, gameObject.id, position, gameObject.type,
+                orientation)
 
             regionRepository.fromPosition(position).addEntity(toggledDoor)
             toggledDoors.put(toggledDoor, gameObject)
@@ -118,7 +119,7 @@ class Door(private val gameObject: GameObject) {
      */
     private fun translateDirection(): Direction? {
         val direction = Direction.WNES[gameObject.orientation]
-        return when(type()) {
+        return when (type()) {
             DoorType.LEFT -> LEFT_HINGE_ORIENTATION[direction]
             DoorType.RIGHT -> RIGHT_HINGE_ORIENTATION[direction]
             DoorType.NOT_SUPPORTED -> null
@@ -127,7 +128,8 @@ class Door(private val gameObject: GameObject) {
 
 }
 
-class OpenDoorAction(private val player: Player, private val door: Door, position: Position) : DistancedAction<Player>(0, true, player, position, DISTANCE) {
+class OpenDoorAction(private val player: Player, private val door: Door, position: Position) : DistancedAction<Player>(
+    0, true, player, position, DISTANCE) {
 
     companion object {
 

game/plugin/shops/src/action.kt

@@ -1,3 +1,5 @@
+package org.apollo.game.plugin.shops
+
 import org.apollo.game.action.DistancedAction
 import org.apollo.game.message.handler.ItemVerificationHandler.InventorySupplier
 import org.apollo.game.message.impl.SetWidgetTextMessage

game/plugin/shops/src/dsl.kt

@@ -1,5 +1,9 @@
-import CategoryWrapper.Affix
+package org.apollo.game.plugin.shops
+
 import org.apollo.cache.def.NpcDefinition
+import org.apollo.game.plugin.shops.CategoryWrapper.Affix
+import org.apollo.game.plugin.util.lookup.lookup_item
+import org.apollo.game.plugin.util.lookup.lookup_npc
 import org.jetbrains.kotlin.utils.keysToMap
 
 /**

game/plugin/shops/src/shop.kt

@@ -1,13 +1,15 @@
-import Shop.Companion.ExchangeType.BUYING
+package org.apollo.game.plugin.shops
-import Shop.Companion.ExchangeType.SELLING
+
-import Shop.PurchasePolicy.ANY
-import Shop.PurchasePolicy.NOTHING
-import Shop.PurchasePolicy.OWNED
 import org.apollo.cache.def.ItemDefinition
 import org.apollo.game.model.Item
 import org.apollo.game.model.entity.Player
 import org.apollo.game.model.inv.Inventory
 import org.apollo.game.model.inv.Inventory.StackMode.STACK_ALWAYS
+import org.apollo.game.plugin.shops.Shop.Companion.ExchangeType.BUYING
+import org.apollo.game.plugin.shops.Shop.Companion.ExchangeType.SELLING
+import org.apollo.game.plugin.shops.Shop.PurchasePolicy.ANY
+import org.apollo.game.plugin.shops.Shop.PurchasePolicy.NOTHING
+import org.apollo.game.plugin.shops.Shop.PurchasePolicy.OWNED
 
 /**
  * Contains shop-related interface ids.

game/plugin/shops/src/shop.plugin.kts

@@ -1,8 +1,12 @@
-
 import org.apollo.game.message.handler.ItemVerificationHandler
 import org.apollo.game.message.impl.ItemActionMessage
 import org.apollo.game.message.impl.NpcActionMessage
 import org.apollo.game.model.entity.Mob
+import org.apollo.game.plugin.shops.Interfaces
+import org.apollo.game.plugin.shops.OpenShopAction
+import org.apollo.game.plugin.shops.PlayerInventorySupplier
+import org.apollo.game.plugin.shops.SHOPS
+import org.apollo.game.plugin.shops.Shop
 import org.apollo.game.scheduling.ScheduledTask
 
 fun Mob.shop(): Shop? = SHOPS[definition.id]

game/plugin/skills/fishing/src/spots.kts

@@ -1,6 +1,7 @@
-
 import org.apollo.game.model.Direction
 import org.apollo.game.model.Position
+import org.apollo.game.plugin.entity.spawn.Spawn
+import org.apollo.game.plugin.entity.spawn.Spawns
 import org.apollo.game.plugin.skills.fishing.FishingSpot
 import org.apollo.game.plugin.skills.fishing.FishingSpot.CAGE_HARPOON
 import org.apollo.game.plugin.skills.fishing.FishingSpot.NET_HARPOON

game/plugin/util/command/src/command.kt

@@ -1,3 +1,5 @@
+package org.apollo.game.plugin.util.command
+
 import org.apollo.game.model.entity.Player
 
 /**

game/plugin/util/lookup/src/lookup.kt

@@ -1,3 +1,5 @@
+package org.apollo.game.plugin.util.lookup
+
 import org.apollo.cache.def.ItemDefinition
 import org.apollo.cache.def.NpcDefinition
 import org.apollo.cache.def.ObjectDefinition