Remove util:lookup plugin

Behaviour moved into the api plugin.
This commit is contained in:
Major
2018-04-08 16:19:02 +01:00
parent fdabea8162
commit 8fe09880b7
11 changed files with 66 additions and 72 deletions
+34
View File
@@ -9,11 +9,45 @@ object Definitions {
return ItemDefinition.lookup(id)
}
fun item(name: String): ItemDefinition? {
return findEntity(ItemDefinition::getDefinitions, ItemDefinition::getName, name)
}
fun obj(id: Int): ObjectDefinition? {
return ObjectDefinition.lookup(id)
}
fun obj(name: String): ObjectDefinition? {
return findEntity(ObjectDefinition::getDefinitions, ObjectDefinition::getName, name)
}
fun npc(id: Int): NpcDefinition? {
return NpcDefinition.lookup(id)
}
fun npc(name: String): NpcDefinition? {
return findEntity(NpcDefinition::getDefinitions, NpcDefinition::getName, name)
}
/**
* The [Regex] used to match 'names' that have an id attached to the end.
*/
private val ID_REGEX = Regex(".+_[0-9]+$")
private fun <T : Any> findEntity(
definitionsProvider: () -> Array<T>,
nameSupplier: T.() -> String,
name: String
): T? {
val definitions = definitionsProvider.invoke()
if (ID_REGEX matches name) {
val id = name.substring(name.lastIndexOf('_') + 1, name.length).toInt()
return definitions.getOrNull(id)
}
val normalizedName = name.replace('_', ' ')
return definitions.firstOrNull { it.nameSupplier().equals(normalizedName, ignoreCase = true) }
}
}
+17
View File
@@ -0,0 +1,17 @@
import org.apollo.cache.def.ItemDefinition
import org.apollo.game.plugin.api.Definitions
import org.apollo.game.plugin.testing.KotlinPluginTest
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
class NamedLookupTests : KotlinPluginTest() {
@Test
fun itemLookup() {
val testItem = ItemDefinition(0)
testItem.name = "sword"
ItemDefinition.init(arrayOf(testItem))
assertThat(Definitions.item("sword")).isEqualTo(testItem)
}
}