Update to Kotlin 1.60 and Gradle 4.9

Removes the dependency on legacy script compilation and now relies on script
discovery.  In addition, the Gradle build scripts were refactored and updated
to be compatible with Gradle 5.0 and make use of the new java-library
configurations.
This commit is contained in:
Gary Tierney
2018-08-19 19:26:51 +01:00
parent 7fee8277ab
commit 0651d535fa
20 changed files with 171 additions and 181 deletions
@@ -0,0 +1,181 @@
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.*
// Al-Kharid
register(NET_ROD, x = 3267, y = 3148)
register(NET_ROD, x = 3268, y = 3147)
register(NET_ROD, x = 3277, y = 3139)
register(CAGE_HARPOON, x = 3350, y = 3817)
register(CAGE_HARPOON, x = 3347, y = 3814)
register(CAGE_HARPOON, x = 3363, y = 3816)
register(CAGE_HARPOON, x = 3368, y = 3811)
// Ardougne
register(ROD, x = 2561, y = 3374)
register(ROD, x = 2562, y = 3374)
register(ROD, x = 2568, y = 3365)
// Bandit camp
register(NET_ROD, x = 3047, y = 3703)
register(NET_ROD, x = 3045, y = 3702)
// Baxtorian falls
register(ROD, x = 2527, y = 3412)
register(ROD, x = 2530, y = 3412)
register(ROD, x = 2533, y = 3410)
// Burgh de Rott
register(NET_HARPOON, x = 3497, y = 3175)
register(NET_HARPOON, x = 3496, y = 3178)
register(NET_HARPOON, x = 3499, y = 3178)
register(NET_HARPOON, x = 3489, y = 3184)
register(NET_HARPOON, x = 3496, y = 3176)
register(NET_HARPOON, x = 3486, y = 3184)
register(NET_HARPOON, x = 3479, y = 3189)
register(NET_HARPOON, x = 3476, y = 3191)
register(NET_HARPOON, x = 3472, y = 3196)
register(NET_HARPOON, x = 3496, y = 3180)
register(NET_HARPOON, x = 3512, y = 3178)
register(NET_HARPOON, x = 3515, y = 3180)
register(NET_HARPOON, x = 3518, y = 3177)
register(NET_HARPOON, x = 3528, y = 3172)
register(NET_HARPOON, x = 3531, y = 3169)
register(NET_HARPOON, x = 3531, y = 3172)
register(NET_HARPOON, x = 3531, y = 3167)
// Camelot
register(ROD, x = 2726, y = 3524)
register(ROD, x = 2727, y = 3524)
// Castle wars
register(ROD, x = 2461, y = 3151)
register(ROD, x = 2461, y = 3150)
register(ROD, x = 2462, y = 3145)
register(ROD, x = 2472, y = 3156)
// Catherby 1
register(NET_ROD, x = 2838, y = 3431)
register(CAGE_HARPOON, x = 2837, y = 3431)
register(CAGE_HARPOON, x = 2836, y = 3431)
register(NET_ROD, x = 2846, y = 3429)
register(NET_ROD, x = 2844, y = 3429)
register(CAGE_HARPOON, x = 2845, y = 3429)
register(NET_HARPOON, x = 2853, y = 3423)
register(NET_HARPOON, x = 2855, y = 3423)
register(NET_HARPOON, x = 2859, y = 3426)
// Draynor village
register(NET_ROD, x = 3085, y = 3230)
register(NET_ROD, x = 3085, y = 3231)
register(NET_ROD, x = 3086, y = 3227)
// Elf camp
register(ROD, x = 2210, y = 3243)
register(ROD, x = 2216, y = 3236)
register(ROD, x = 2222, y = 3241)
// Entrana
register(NET_ROD, x = 2843, y = 3359)
register(NET_ROD, x = 2842, y = 3359)
register(NET_ROD, x = 2847, y = 3361)
register(NET_ROD, x = 2848, y = 3361)
register(NET_ROD, x = 2840, y = 3356)
register(NET_ROD, x = 2845, y = 3356)
register(NET_ROD, x = 2875, y = 3342)
register(NET_ROD, x = 2876, y = 3342)
register(NET_ROD, x = 2877, y = 3342)
// Fishing guild
register(CAGE_HARPOON, x = 2612, y = 3411)
register(CAGE_HARPOON, x = 2607, y = 3410)
register(NET_HARPOON, x = 2612, y = 3414)
register(NET_HARPOON, x = 2612, y = 3415)
register(NET_HARPOON, x = 2609, y = 3416)
register(CAGE_HARPOON, x = 2604, y = 3417)
register(NET_HARPOON, x = 2605, y = 3416)
register(NET_HARPOON, x = 2602, y = 3411)
register(NET_HARPOON, x = 2602, y = 3412)
register(CAGE_HARPOON, x = 2602, y = 3414)
register(NET_HARPOON, x = 2603, y = 3417)
register(NET_HARPOON, x = 2599, y = 3419)
register(NET_HARPOON, x = 2601, y = 3422)
register(NET_HARPOON, x = 2605, y = 3421)
register(CAGE_HARPOON, x = 2602, y = 3426)
register(NET_HARPOON, x = 2604, y = 3426)
register(CAGE_HARPOON, x = 2605, y = 3425)
// Fishing platform
register(NET_ROD, x = 2791, y = 3279)
register(NET_ROD, x = 2795, y = 3279)
register(NET_ROD, x = 2790, y = 3273)
// Grand Tree
register(ROD, x = 2393, y = 3419)
register(ROD, x = 2391, y = 3421)
register(ROD, x = 2389, y = 3423)
register(ROD, x = 2388, y = 3423)
register(ROD, x = 2385, y = 3422)
register(ROD, x = 2384, y = 3419)
register(ROD, x = 2383, y = 3417)
// Karamja
register(NET_ROD, x = 2921, y = 3178)
register(CAGE_HARPOON, x = 2923, y = 3179)
register(CAGE_HARPOON, x = 2923, y = 3180)
register(NET_ROD, x = 2924, y = 3181)
register(NET_ROD, x = 2926, y = 3180)
register(CAGE_HARPOON, x = 2926, y = 3179)
// Lumbridge
register(ROD, x = 3239, y = 3244)
register(NET_ROD, x = 3238, y = 3252)
// Miscellenia
register(CAGE_HARPOON, x = 2580, y = 3851)
register(CAGE_HARPOON, x = 2581, y = 3851)
register(CAGE_HARPOON, x = 2582, y = 3851)
register(CAGE_HARPOON, x = 2583, y = 3852)
register(CAGE_HARPOON, x = 2583, y = 3853)
// Rellekka
register(NET_ROD, x = 2633, y = 3691)
register(NET_ROD, x = 2633, y = 3689)
register(CAGE_HARPOON, x = 2639, y = 3698)
register(CAGE_HARPOON, x = 2639, y = 3697)
register(CAGE_HARPOON, x = 2639, y = 3695)
register(NET_HARPOON, x = 2642, y = 3694)
register(NET_HARPOON, x = 2642, y = 3697)
register(NET_HARPOON, x = 2644, y = 3709)
// Rimmington
register(NET_ROD, x = 2990, y = 3169)
register(NET_ROD, x = 2986, y = 3176)
// Shilo Village
register(ROD, x = 2855, y = 2974)
register(ROD, x = 2865, y = 2972)
register(ROD, x = 2860, y = 2972)
register(ROD, x = 2835, y = 2974)
register(ROD, x = 2859, y = 2976)
// Tirannwn
register(ROD, x = 2266, y = 3253)
register(ROD, x = 2265, y = 3258)
register(ROD, x = 2264, y = 3258)
// Tutorial island
register(NET_ROD, x = 3101, y = 3092)
register(NET_ROD, x = 3103, y = 3092)
/**
* Registers the [FishingSpot] at the specified position.
*/
fun register(spot: FishingSpot, x: Int, y: Int, z: Int = 0) {
val position = Position(x, y, z)
Spawns.list.add(Spawn(spot.npc, "", position, Direction.NORTH))
}