From 675d576c58957bb6f020031e87223313a3eb5dfe Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sat, 18 Feb 2023 09:18:24 +0000 Subject: [PATCH] Updated kotlin to 1.8.0 Updated kotlin target to java 11 Fixed build errors when targeting 1.8.0 --- Server/pom.xml | 4 ++-- Server/src/main/content/global/bots/ChickenKiller.kt | 3 +-- Server/src/main/content/global/bots/GenericSlayerBot.kt | 3 +-- Server/src/main/content/global/bots/GnomeBowstring.kt | 2 ++ Server/src/main/content/global/bots/SeersFlax.kt | 4 ++-- .../main/content/global/skill/gather/fishing/FishingPulse.kt | 1 + .../src/main/content/minigame/allfiredup/AFUBeaconHandler.kt | 2 ++ .../fremennik/rellekka/quest/thefremenniktrials/KoscheiNPC.kt | 2 +- Server/src/main/core/game/bots/CombatBotAssembler.kt | 1 + .../core/game/node/entity/combat/graves/GraveController.kt | 1 + Server/src/main/core/net/packet/PacketProcessor.kt | 1 + Server/src/main/core/net/packet/in/Decoders530.kt | 1 + Server/src/main/core/net/packet/in/QuickChatPacketHandler.kt | 1 + 13 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Server/pom.xml b/Server/pom.xml index 265799c61..2e8e132d2 100644 --- a/Server/pom.xml +++ b/Server/pom.xml @@ -7,8 +7,8 @@ core.Server true - 1.6.21 - 1.6 + 1.8.0 + 11 5.7.0 11 11 diff --git a/Server/src/main/content/global/bots/ChickenKiller.kt b/Server/src/main/content/global/bots/ChickenKiller.kt index b74c18ab7..ee817573f 100644 --- a/Server/src/main/content/global/bots/ChickenKiller.kt +++ b/Server/src/main/content/global/bots/ChickenKiller.kt @@ -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, diff --git a/Server/src/main/content/global/bots/GenericSlayerBot.kt b/Server/src/main/content/global/bots/GenericSlayerBot.kt index 2ee9d2b1d..15c342785 100644 --- a/Server/src/main/content/global/bots/GenericSlayerBot.kt +++ b/Server/src/main/content/global/bots/GenericSlayerBot.kt @@ -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, diff --git a/Server/src/main/content/global/bots/GnomeBowstring.kt b/Server/src/main/content/global/bots/GnomeBowstring.kt index ae1d99555..a835aa37f 100644 --- a/Server/src/main/content/global/bots/GnomeBowstring.kt +++ b/Server/src/main/content/global/bots/GnomeBowstring.kt @@ -155,6 +155,8 @@ class GnomeBowstring : Script() { state = State.PICKING } } + + else -> {} } } override fun newInstance(): Script { diff --git a/Server/src/main/content/global/bots/SeersFlax.kt b/Server/src/main/content/global/bots/SeersFlax.kt index 30d8ffee3..d39942005 100644 --- a/Server/src/main/content/global/bots/SeersFlax.kt +++ b/Server/src/main/content/global/bots/SeersFlax.kt @@ -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) -> { diff --git a/Server/src/main/content/global/skill/gather/fishing/FishingPulse.kt b/Server/src/main/content/global/skill/gather/fishing/FishingPulse.kt index 15f0391fa..6240e1da7 100644 --- a/Server/src/main/content/global/skill/gather/fishing/FishingPulse.kt +++ b/Server/src/main/content/global/skill/gather/fishing/FishingPulse.kt @@ -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 -> {} } } diff --git a/Server/src/main/content/minigame/allfiredup/AFUBeaconHandler.kt b/Server/src/main/content/minigame/allfiredup/AFUBeaconHandler.kt index 0d6364ce6..6ff32e821 100644 --- a/Server/src/main/content/minigame/allfiredup/AFUBeaconHandler.kt +++ b/Server/src/main/content/minigame/allfiredup/AFUBeaconHandler.kt @@ -74,6 +74,8 @@ class AFUBeaconListeners : InteractionListener { } } + else -> {} + } if(player.skills.getLevel(Skills.FIREMAKING) < beacon.fmLevel){ diff --git a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/KoscheiNPC.kt b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/KoscheiNPC.kt index b78d36bd8..7c4bf2540 100644 --- a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/KoscheiNPC.kt +++ b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/KoscheiNPC.kt @@ -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() diff --git a/Server/src/main/core/game/bots/CombatBotAssembler.kt b/Server/src/main/core/game/bots/CombatBotAssembler.kt index fa0a7fde5..7655d98e9 100644 --- a/Server/src/main/core/game/bots/CombatBotAssembler.kt +++ b/Server/src/main/core/game/bots/CombatBotAssembler.kt @@ -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) diff --git a/Server/src/main/core/game/node/entity/combat/graves/GraveController.kt b/Server/src/main/core/game/node/entity/combat/graves/GraveController.kt index 1bff66e63..9cc61aef2 100644 --- a/Server/src/main/core/game/node/entity/combat/graves/GraveController.kt +++ b/Server/src/main/core/game/node/entity/combat/graves/GraveController.kt @@ -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) diff --git a/Server/src/main/core/net/packet/PacketProcessor.kt b/Server/src/main/core/net/packet/PacketProcessor.kt index 33ebf86c2..0ba9d3494 100644 --- a/Server/src/main/core/net/packet/PacketProcessor.kt +++ b/Server/src/main/core/net/packet/PacketProcessor.kt @@ -297,6 +297,7 @@ object PacketProcessor { //TODO see above todo } + else -> {} } } diff --git a/Server/src/main/core/net/packet/in/Decoders530.kt b/Server/src/main/core/net/packet/in/Decoders530.kt index bb567da69..327ca29d9 100644 --- a/Server/src/main/core/net/packet/in/Decoders530.kt +++ b/Server/src/main/core/net/packet/in/Decoders530.kt @@ -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) } diff --git a/Server/src/main/core/net/packet/in/QuickChatPacketHandler.kt b/Server/src/main/core/net/packet/in/QuickChatPacketHandler.kt index 30e6815b7..de7a3f7fe 100644 --- a/Server/src/main/core/net/packet/in/QuickChatPacketHandler.kt +++ b/Server/src/main/core/net/packet/in/QuickChatPacketHandler.kt @@ -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 -> {} }