From 6e3ddff51a206f6bd11233949f14d50ba7b2bd88 Mon Sep 17 00:00:00 2001 From: Major Date: Sun, 24 Sep 2017 22:56:48 +0100 Subject: [PATCH] Correctly import api.Definitions --- game/plugin/skills/mining/src/mining.plugin.kts | 4 ++++ game/plugin/skills/woodcutting/src/woodcutting.plugin.kts | 4 ++++ game/plugin/util/lookup/test/LookupTests.kt | 8 +++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/game/plugin/skills/mining/src/mining.plugin.kts b/game/plugin/skills/mining/src/mining.plugin.kts index 418bcbb8..c7d34db2 100644 --- a/game/plugin/skills/mining/src/mining.plugin.kts +++ b/game/plugin/skills/mining/src/mining.plugin.kts @@ -6,7 +6,11 @@ import org.apollo.game.model.Position import org.apollo.game.model.World import org.apollo.game.model.entity.Player import org.apollo.game.model.entity.obj.GameObject +import org.apollo.game.plugin.api.Definitions +import org.apollo.game.plugin.api.expireObject +import org.apollo.game.plugin.api.findObject import org.apollo.game.plugin.api.mining +import org.apollo.game.plugin.api.rand import org.apollo.game.plugin.skills.mining.Ore import org.apollo.game.plugin.skills.mining.PICKAXES import org.apollo.game.plugin.skills.mining.Pickaxe diff --git a/game/plugin/skills/woodcutting/src/woodcutting.plugin.kts b/game/plugin/skills/woodcutting/src/woodcutting.plugin.kts index df04e9fe..ca20a248 100644 --- a/game/plugin/skills/woodcutting/src/woodcutting.plugin.kts +++ b/game/plugin/skills/woodcutting/src/woodcutting.plugin.kts @@ -6,6 +6,10 @@ import org.apollo.game.model.Position import org.apollo.game.model.World import org.apollo.game.model.entity.Player import org.apollo.game.model.entity.obj.GameObject +import org.apollo.game.plugin.api.Definitions +import org.apollo.game.plugin.api.expireObject +import org.apollo.game.plugin.api.findObject +import org.apollo.game.plugin.api.rand import org.apollo.game.plugin.api.woodcutting import org.apollo.game.plugin.skills.woodcutting.Axe import org.apollo.game.plugin.skills.woodcutting.Tree diff --git a/game/plugin/util/lookup/test/LookupTests.kt b/game/plugin/util/lookup/test/LookupTests.kt index fc4c18f9..680c9c15 100644 --- a/game/plugin/util/lookup/test/LookupTests.kt +++ b/game/plugin/util/lookup/test/LookupTests.kt @@ -1,15 +1,17 @@ import org.apollo.cache.def.ItemDefinition -import org.apollo.game.plugin.testing.* +import org.apollo.game.plugin.testing.KotlinPluginTest +import org.apollo.game.plugin.util.lookup.lookup_item import org.assertj.core.api.Assertions.assertThat import org.junit.Test class LookupTests : KotlinPluginTest() { - @Test fun itemLookup() { + @Test + fun itemLookup() { val testItem = ItemDefinition(0) testItem.name = "sword" ItemDefinition.init(arrayOf(testItem)) - assertThat(lookup_item("sword")).isEqualTo(testItem); + assertThat(lookup_item("sword")).isEqualTo(testItem) } } \ No newline at end of file