Updated kotlin to 1.8.0
Updated kotlin target to java 11 Fixed build errors when targeting 1.8.0
This commit is contained in:
+2
-2
@@ -7,8 +7,8 @@
|
||||
<properties>
|
||||
<project.mainClassName>core.Server</project.mainClassName>
|
||||
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
|
||||
<kotlin.version>1.6.21</kotlin.version>
|
||||
<kotlin.comipler.jvmTarget>1.6</kotlin.comipler.jvmTarget>
|
||||
<kotlin.version>1.8.0</kotlin.version>
|
||||
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
|
||||
<junit.version>5.7.0</junit.version>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
|
||||
@@ -23,6 +23,7 @@ class ChickenKiller : Script(){
|
||||
|
||||
override fun tick() {
|
||||
when(state){
|
||||
State.CONFIG -> {}
|
||||
State.INIT -> {
|
||||
overlay = scriptAPI.getOverlay()
|
||||
overlay!!.init()
|
||||
@@ -103,8 +104,6 @@ class ChickenKiller : Script(){
|
||||
IDLE,
|
||||
INIT,
|
||||
KILLING,
|
||||
LOOTING,
|
||||
RETURN,
|
||||
CONFIG,
|
||||
LOOTFEATHER,
|
||||
LOOTBONES,
|
||||
|
||||
@@ -64,7 +64,7 @@ class GenericSlayerBot : Script() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -220,7 +220,6 @@ class GenericSlayerBot : Script() {
|
||||
GETTING_TASK,
|
||||
GOING_TO_HUB,
|
||||
KILLING_ENEMY,
|
||||
LOOTING,
|
||||
GOING_TO_BANK,
|
||||
BANKING,
|
||||
GOING_TO_GE,
|
||||
|
||||
@@ -155,6 +155,8 @@ class GnomeBowstring : Script() {
|
||||
state = State.PICKING
|
||||
}
|
||||
}
|
||||
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
override fun newInstance(): Script {
|
||||
|
||||
@@ -65,8 +65,8 @@ class SeersFlax : Script(){
|
||||
State.FIND_BANK -> {
|
||||
when(bot.location){
|
||||
Location.create(2711, 3471, 1) -> {
|
||||
val ladder = scriptAPI.getNearestNode(25939,true)
|
||||
ladder?.interaction?.handle(bot,ladder?.interaction[0])
|
||||
val ladder = scriptAPI.getNearestNode(25939,true) ?: return
|
||||
ladder.interaction?.handle(bot,ladder.interaction[0])
|
||||
}
|
||||
Location.create(2714, 3470, 0) -> Pathfinder.find(bot,Location.create(2715, 3472, 0)).walk(bot)
|
||||
Location.create(2715, 3472, 0) -> {
|
||||
|
||||
@@ -169,6 +169,7 @@ class FishingPulse(player: Player?, npc: NPC, private val option: FishingOption?
|
||||
player.skillTasks.decreaseTask(player, SkillTasks.FTUNA1)
|
||||
player.skillTasks.decreaseTask(player, SkillTasks.FTUNA2)
|
||||
}
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -74,6 +74,8 @@ class AFUBeaconListeners : InteractionListener {
|
||||
}
|
||||
}
|
||||
|
||||
else -> {}
|
||||
|
||||
}
|
||||
|
||||
if(player.skills.getLevel(Skills.FIREMAKING) < beacon.fmLevel){
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ class KoscheiNPC constructor(id: Int = 0, location: Location? = null, session: K
|
||||
} else {
|
||||
session?.player?.sendMessage("Congratulations! You have completed the warriors trial!")
|
||||
session?.player?.setAttribute("/save:fremtrials:thorvald-vote",true)
|
||||
session?.player?.setAttribute("/save:fremtrials:votes", session?.player?.getAttribute("fremtrials:votes", 0) + 1)
|
||||
session?.player?.setAttribute("/save:fremtrials:votes", session.player.getAttribute("fremtrials:votes", 0) + 1)
|
||||
session?.player?.removeAttribute("fremtrials:warrior-accepted")
|
||||
addItemOrDrop(session?.player!!, Items.FREMENNIK_BLADE_3757, 1)
|
||||
session.close()
|
||||
|
||||
@@ -422,6 +422,7 @@ class CombatBotAssembler {
|
||||
bot.skills.setStaticLevel(Skills.RANGE,1)
|
||||
bot.skills.setStaticLevel(Skills.MAGIC,1)
|
||||
}
|
||||
else -> {}
|
||||
}
|
||||
|
||||
bot.skills.addExperience(Skills.HITPOINTS, (totalXPAdd / skillAmt) * 0.2)
|
||||
|
||||
@@ -75,6 +75,7 @@ class GraveController : PersistWorld, TickListener, InteractionListener, Command
|
||||
|
||||
when (grave.type) {
|
||||
in GraveType.SMALL_GS..GraveType.ANGEL_DEATH -> isGraniteBackground = true
|
||||
else -> {}
|
||||
}
|
||||
|
||||
if (isGraniteBackground)
|
||||
|
||||
@@ -297,6 +297,7 @@ object PacketProcessor {
|
||||
//TODO see above todo
|
||||
|
||||
}
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -709,6 +709,7 @@ enum class Decoders530(val opcode: Int) {
|
||||
selection_b_index = buffer.get()
|
||||
}
|
||||
QCPacketType.UNHANDLED -> SystemLogger.logWarn(this::class.java, "Unhandled packet type, skipping remaining buffer contents.")
|
||||
else -> {}
|
||||
}
|
||||
return Packet.QuickChat(player, selection_a_index, selection_b_index, forClan, multiplier, offset, packetType)
|
||||
}
|
||||
|
||||
@@ -51,6 +51,7 @@ class QuickChatPacketHandler : IncomingPacket {
|
||||
selection_b_index = buffer.get()
|
||||
}
|
||||
QCPacketType.UNHANDLED -> SystemLogger.logWarn(this::class.java, "Unhandled packet type, skipping remaining buffer contents.")
|
||||
else -> {}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user