From e20347ecac7095106864052f489ab3ef46836b4b Mon Sep 17 00:00:00 2001 From: Ross Binden Date: Tue, 3 May 2016 22:23:57 +0100 Subject: [PATCH 1/3] Do not assert not null on occurrences of core for #10 --- .../bukkit/character/BukkitCharacter.kt | 4 ++-- .../character/BukkitCharacterProvider.kt | 16 +++++++-------- .../command/character/CharacterCardCommand.kt | 4 ++-- .../character/CharacterDeleteCommand.kt | 18 ++++++++--------- .../command/character/CharacterListCommand.kt | 4 ++-- .../command/character/CharacterNewCommand.kt | 20 +++++++++---------- .../character/CharacterSetAgeCommand.kt | 8 ++++---- .../character/CharacterSetDeadCommand.kt | 8 ++++---- .../CharacterSetDescriptionCommand.kt | 8 ++++---- .../character/CharacterSetGenderCommand.kt | 16 +++++++-------- .../character/CharacterSetNameCommand.kt | 8 ++++---- .../character/CharacterSetPlayerCommand.kt | 8 ++++---- .../character/CharacterSetRaceCommand.kt | 16 +++++++-------- .../character/CharacterSwitchCommand.kt | 16 +++++++-------- .../bukkit/command/gender/GenderAddCommand.kt | 6 +++--- .../command/gender/GenderListCommand.kt | 2 +- .../command/gender/GenderRemoveCommand.kt | 6 +++--- .../bukkit/command/race/RaceAddCommand.kt | 6 +++--- .../bukkit/command/race/RaceListCommand.kt | 2 +- .../bukkit/command/race/RaceRemoveCommand.kt | 6 +++--- .../database/table/BukkitCharacterTable.kt | 6 +++--- .../bukkit/gender/BukkitGenderProvider.kt | 10 +++++----- .../bukkit/listener/PlayerDeathListener.kt | 4 ++-- .../listener/PlayerInteractEntityListener.kt | 4 ++-- .../bukkit/listener/PlayerMoveListener.kt | 4 ++-- .../bukkit/race/BukkitRaceProvider.kt | 10 +++++----- .../chatchannel/BukkitChatChannelProvider.kt | 14 ++++++------- ...ukkitFormatChatChannelPipelineComponent.kt | 2 +- .../chatchannel/ChatChannelCreateCommand.kt | 4 ++-- .../chatchannel/ChatChannelDeleteCommand.kt | 6 +++--- .../chatchannel/ChatChannelJoinCommand.kt | 12 +++++------ .../chatchannel/ChatChannelLeaveCommand.kt | 10 +++++----- .../chatchannel/ChatChannelListCommand.kt | 2 +- .../ChatChannelSetClearRadiusCommand.kt | 4 ++-- .../chatchannel/ChatChannelSetColorCommand.kt | 4 ++-- .../ChatChannelSetFormatCommand.kt | 6 +++--- .../ChatChannelSetIRCChannelCommand.kt | 4 ++-- .../ChatChannelSetIRCEnabledCommand.kt | 4 ++-- .../ChatChannelSetIRCWhitelistCommand.kt | 4 ++-- .../ChatChannelSetJoinedByDefaultCommand.kt | 4 ++-- .../ChatChannelSetMatchPatternCommand.kt | 4 ++-- .../chatchannel/ChatChannelSetNameCommand.kt | 6 +++--- .../ChatChannelSetRadiusCommand.kt | 4 ++-- .../chatchannel/ChatChannelSpeakCommand.kt | 12 +++++------ .../database/table/BukkitChatChannelTable.kt | 18 ++++++++--------- .../listener/AsyncPlayerChatListener.kt | 4 ++-- .../bukkit/listener/PlayerJoinListener.kt | 4 ++-- .../elysium/core/bukkit/ElysiumCoreBukkit.kt | 6 +++--- .../players/bukkit/BukkitPlayerProvider.kt | 8 ++++---- 49 files changed, 183 insertions(+), 183 deletions(-) diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/character/BukkitCharacter.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/character/BukkitCharacter.kt index f98371cae..018d74880 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/character/BukkitCharacter.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/character/BukkitCharacter.kt @@ -17,9 +17,9 @@ class BukkitCharacter constructor( id: Int = 0, player: ElysiumPlayer?, name: String = plugin.config.getString("characters.defaults.name"), - gender: Gender? = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java).getGender(plugin.config.getString("characters.defaults.gender")), + gender: Gender? = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java).getGender(plugin.config.getString("characters.defaults.gender")), age: Int = plugin.config.getInt("characters.defaults.age"), - race: Race? = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java).getRace(plugin.config.getString("characters.defaults.race")), + race: Race? = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java).getRace(plugin.config.getString("characters.defaults.race")), description: String = plugin.config.getString("characters.defaults.description"), dead: Boolean = plugin.config.getBoolean("characters.defaults.dead"), location: Location = Bukkit.getWorlds()[0].spawnLocation, diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/character/BukkitCharacterProvider.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/character/BukkitCharacterProvider.kt index a58dc448c..f3a9ee9ea 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/character/BukkitCharacterProvider.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/character/BukkitCharacterProvider.kt @@ -33,7 +33,7 @@ class BukkitCharacterProvider : CharacterProvider { } override fun getCharacter(id: Int): BukkitCharacter? { - return plugin.core!!.database.getTable(BukkitCharacter::class.java)!![id] + return plugin.core.database.getTable(BukkitCharacter::class.java)!![id] } override fun getActiveCharacter(player: ElysiumPlayer): BukkitCharacter? { @@ -43,7 +43,7 @@ class BukkitCharacterProvider : CharacterProvider { } else { try { var character: BukkitCharacter? = null - plugin.core!!.database.createConnection().use { connection -> + plugin.core.database.createConnection().use { connection -> connection.prepareStatement( "SELECT character_id FROM player_character WHERE player_id = ?").use({ statement -> statement.setInt(1, player.id) @@ -84,7 +84,7 @@ class BukkitCharacterProvider : CharacterProvider { } if (character != null) { try { - plugin.core!!.database.createConnection().use { connection -> + plugin.core.database.createConnection().use { connection -> connection.prepareStatement( "INSERT INTO player_character(player_id, character_id) VALUES(?, ?) ON DUPLICATE KEY UPDATE character_id = VALUES(character_id)").use({ statement -> statement.setInt(1, player.id) @@ -114,7 +114,7 @@ class BukkitCharacterProvider : CharacterProvider { activeCharacterCache.put(player.id as Integer, character.id as Integer) } else if (oldCharacter != null) { try { - plugin.core!!.database.createConnection().use { connection -> + plugin.core.database.createConnection().use { connection -> connection.prepareStatement( "DELETE FROM player_character WHERE player_id = ? AND character_id = ?").use({ statement -> statement.setInt(1, player.id) @@ -132,7 +132,7 @@ class BukkitCharacterProvider : CharacterProvider { override fun getCharacters(player: ElysiumPlayer): Collection { try { var characters: MutableList = ArrayList() - plugin.core!!.database.createConnection().use { connection -> + plugin.core.database.createConnection().use { connection -> connection.prepareStatement( "SELECT id FROM bukkit_character WHERE player_id = ? ORDER BY id").use({ statement -> statement.setInt(1, player.id) @@ -151,21 +151,21 @@ class BukkitCharacterProvider : CharacterProvider { } override fun addCharacter(character: BukkitCharacter): Int { - return plugin.core!!.database.getTable(BukkitCharacter::class.java)!!.insert(character) + return plugin.core.database.getTable(BukkitCharacter::class.java)!!.insert(character) } override fun removeCharacter(character: BukkitCharacter) { val player = character.player if (player != null) setActiveCharacter(player, null) - plugin.core!!.database.getTable(BukkitCharacter::class.java)!!.delete(character) + plugin.core.database.getTable(BukkitCharacter::class.java)!!.delete(character) } override fun updateCharacter(character: BukkitCharacter) { if (plugin.config.getBoolean("characters.delete-character-on-death") && character.isDead) { removeCharacter(character) } else { - plugin.core!!.database.getTable(BukkitCharacter::class.java)!!.update(character) + plugin.core.database.getTable(BukkitCharacter::class.java)!!.update(character) } } diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterCardCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterCardCommand.kt index 37fa582bf..6d0608792 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterCardCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterCardCommand.kt @@ -14,8 +14,8 @@ class CharacterCardCommand(private val plugin: ElysiumCharactersBukkit) : Comman override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.characters.command.character.card.self")) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(sender) val character = characterProvider.getActiveCharacter(player) if (character != null) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterDeleteCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterDeleteCommand.kt index fb60c1853..1afe75b2c 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterDeleteCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterDeleteCommand.kt @@ -42,8 +42,8 @@ class CharacterDeleteCommand(private val plugin: ElysiumCharactersBukkit) : Comm characterNameBuilder.append(args[i]).append(" ") } characterNameBuilder.append(args[args.size - 1]) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(sender) var charFound = false // Prioritise exact matches... @@ -90,8 +90,8 @@ class CharacterDeleteCommand(private val plugin: ElysiumCharactersBukkit) : Comm override fun isInputValid(context: ConversationContext, input: String): Boolean { val conversable = context.forWhom if (conversable is Player) { - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(conversable) for (character in characterProvider.getCharacters(player)) { if (character.name.equals(input, ignoreCase = true)) { @@ -110,8 +110,8 @@ class CharacterDeleteCommand(private val plugin: ElysiumCharactersBukkit) : Comm override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { val conversable = context.forWhom if (conversable is Player) { - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(conversable) var charFound = false // Prioritise exact matches... @@ -140,9 +140,9 @@ class CharacterDeleteCommand(private val plugin: ElysiumCharactersBukkit) : Comm } override fun getPromptText(context: ConversationContext): String { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(context.forWhom as Player) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val characterListBuilder = StringBuilder() for (character in characterProvider.getCharacters(player)) { characterListBuilder.append("\n").append( @@ -158,7 +158,7 @@ class CharacterDeleteCommand(private val plugin: ElysiumCharactersBukkit) : Comm override fun acceptValidatedInput(context: ConversationContext, input: Boolean): Prompt? { if (input) { - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val character = characterProvider.getCharacter(context.getSessionData("character_id") as Int) characterProvider.removeCharacter(character!!) return CharacterDeletedPrompt() diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterListCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterListCommand.kt index ec90752f4..7d839382d 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterListCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterListCommand.kt @@ -14,8 +14,8 @@ class CharacterListCommand(private val plugin: ElysiumCharactersBukkit) : Comman override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.characters.command.character.list")) { - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(sender) sender.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.character-list-title"))) for (character in characterProvider.getCharacters(player)) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterNewCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterNewCommand.kt index b03e08e14..62684b127 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterNewCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterNewCommand.kt @@ -70,11 +70,11 @@ class CharacterNewCommand(private val plugin: ElysiumCharactersBukkit) : Command private inner class GenderPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java).getGender(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java).getGender(input) != null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) context.setSessionData("gender", genderProvider.getGender(input)) return GenderSetPrompt() } @@ -84,7 +84,7 @@ class CharacterNewCommand(private val plugin: ElysiumCharactersBukkit) : Command } override fun getPromptText(context: ConversationContext): String { - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) val genderListBuilder = StringBuilder() for (gender in genderProvider.genders) { genderListBuilder.append(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.gender-list-item") @@ -147,11 +147,11 @@ class CharacterNewCommand(private val plugin: ElysiumCharactersBukkit) : Command private inner class RacePrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java).getRace(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java).getRace(input) != null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) context.setSessionData("race", raceProvider.getRace(input)) return RaceSetPrompt() } @@ -161,7 +161,7 @@ class CharacterNewCommand(private val plugin: ElysiumCharactersBukkit) : Command } override fun getPromptText(context: ConversationContext): String { - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) val raceListBuilder = StringBuilder() for (race in raceProvider.races) { raceListBuilder.append(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.race-list-item") @@ -197,8 +197,8 @@ class CharacterNewCommand(private val plugin: ElysiumCharactersBukkit) : Command if (input.equals("end", ignoreCase = true)) { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(conversable) val character = characterProvider.getActiveCharacter(player) if (character != null) { @@ -237,8 +237,8 @@ class CharacterNewCommand(private val plugin: ElysiumCharactersBukkit) : Command override fun getPromptText(context: ConversationContext): String { val conversable = context.forWhom if (conversable is Player) { - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(conversable) val newCharacter = BukkitCharacter( plugin = plugin, diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetAgeCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetAgeCommand.kt index 3fff0ec07..7e73c92c9 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetAgeCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetAgeCommand.kt @@ -27,8 +27,8 @@ class CharacterSetAgeCommand(private val plugin: ElysiumCharactersBukkit) : Comm override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.characters.command.character.set.age")) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(sender) val character = characterProvider.getActiveCharacter(player) if (character != null) { @@ -82,8 +82,8 @@ class CharacterSetAgeCommand(private val plugin: ElysiumCharactersBukkit) : Comm override fun acceptValidatedInput(context: ConversationContext, input: Number): Prompt { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(conversable) val character = characterProvider.getActiveCharacter(player) if (character != null) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetDeadCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetDeadCommand.kt index cd4794524..bce53c12b 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetDeadCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetDeadCommand.kt @@ -29,8 +29,8 @@ class CharacterSetDeadCommand(private val plugin: ElysiumCharactersBukkit) : Com override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.characters.command.character.set.dead")) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(sender) val character = characterProvider.getActiveCharacter(player) if (character != null) { @@ -63,8 +63,8 @@ class CharacterSetDeadCommand(private val plugin: ElysiumCharactersBukkit) : Com override fun acceptValidatedInput(context: ConversationContext, input: Boolean): Prompt { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(conversable) val character = characterProvider.getActiveCharacter(player) if (character != null) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetDescriptionCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetDescriptionCommand.kt index a1783f8fc..3ca7facba 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetDescriptionCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetDescriptionCommand.kt @@ -27,8 +27,8 @@ class CharacterSetDescriptionCommand(private val plugin: ElysiumCharactersBukkit override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.characters.command.character.set.description")) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(sender) val character = characterProvider.getActiveCharacter(player) if (character != null) { @@ -69,8 +69,8 @@ class CharacterSetDescriptionCommand(private val plugin: ElysiumCharactersBukkit if (input.equals("end", ignoreCase = true)) { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(conversable) val character = characterProvider.getActiveCharacter(player) if (character != null) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetGenderCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetGenderCommand.kt index a79264e00..e69556da7 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetGenderCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetGenderCommand.kt @@ -28,13 +28,13 @@ class CharacterSetGenderCommand(private val plugin: ElysiumCharactersBukkit) : C override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.characters.command.character.set.gender")) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(sender) val character = characterProvider.getActiveCharacter(player) if (character != null) { if (args.size > 0) { - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) val gender = genderProvider.getGender(args[0]) if (gender != null) { character.gender = gender @@ -61,15 +61,15 @@ class CharacterSetGenderCommand(private val plugin: ElysiumCharactersBukkit) : C private inner class GenderPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java).getGender(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java).getGender(input) != null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) val player = playerProvider.getPlayer(conversable) val character = characterProvider.getActiveCharacter(player) if (character != null) { @@ -85,7 +85,7 @@ class CharacterSetGenderCommand(private val plugin: ElysiumCharactersBukkit) : C } override fun getPromptText(context: ConversationContext): String { - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) val genderListBuilder = StringBuilder() for (gender in genderProvider.genders) { genderListBuilder.append(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.gender-list-item") diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetNameCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetNameCommand.kt index 354cbbf8e..45738d125 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetNameCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetNameCommand.kt @@ -27,8 +27,8 @@ class CharacterSetNameCommand(private val plugin: ElysiumCharactersBukkit) : Com override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.characters.command.character.set.name")) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(sender) val character = characterProvider.getActiveCharacter(player) if (character != null) { @@ -65,8 +65,8 @@ class CharacterSetNameCommand(private val plugin: ElysiumCharactersBukkit) : Com override fun acceptInput(context: ConversationContext, input: String): Prompt { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(conversable) val character = characterProvider.getActiveCharacter(player) if (character != null) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetPlayerCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetPlayerCommand.kt index 60be11fea..51bdff7ee 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetPlayerCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetPlayerCommand.kt @@ -29,8 +29,8 @@ class CharacterSetPlayerCommand(private val plugin: ElysiumCharactersBukkit) : C override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.characters.command.character.set.player")) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(sender) val character = characterProvider.getActiveCharacter(player) if (character != null) { @@ -65,8 +65,8 @@ class CharacterSetPlayerCommand(private val plugin: ElysiumCharactersBukkit) : C override fun acceptValidatedInput(context: ConversationContext, input: Player): Prompt { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(conversable) val character = characterProvider.getActiveCharacter(player) if (character != null) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetRaceCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetRaceCommand.kt index 87d29e697..c0de5eb30 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetRaceCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSetRaceCommand.kt @@ -28,8 +28,8 @@ class CharacterSetRaceCommand(private val plugin: ElysiumCharactersBukkit) : Com override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.characters.command.character.set.race")) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(sender) val character = characterProvider.getActiveCharacter(player) if (character != null) { @@ -39,7 +39,7 @@ class CharacterSetRaceCommand(private val plugin: ElysiumCharactersBukkit) : Com raceBuilder.append(args[i]).append(" ") } raceBuilder.append(args[args.size - 1]) - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) val race = raceProvider.getRace(raceBuilder.toString()) if (race != null) { character.race = race @@ -66,15 +66,15 @@ class CharacterSetRaceCommand(private val plugin: ElysiumCharactersBukkit) : Com private inner class RacePrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java).getRace(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java).getRace(input) != null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) val player = playerProvider.getPlayer(conversable) val character = characterProvider.getActiveCharacter(player) if (character != null) { @@ -90,7 +90,7 @@ class CharacterSetRaceCommand(private val plugin: ElysiumCharactersBukkit) : Com } override fun getPromptText(context: ConversationContext): String { - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) val raceListBuilder = StringBuilder() for (race in raceProvider.races) { raceListBuilder.append(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.race-list-item") diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSwitchCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSwitchCommand.kt index e0d60a1d2..165f3a773 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSwitchCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/character/CharacterSwitchCommand.kt @@ -33,8 +33,8 @@ class CharacterSwitchCommand(private val plugin: ElysiumCharactersBukkit) : Comm characterNameBuilder.append(args[i]).append(" ") } characterNameBuilder.append(args[args.size - 1]) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(sender) var charFound = false // Prioritise exact matches... @@ -77,8 +77,8 @@ class CharacterSwitchCommand(private val plugin: ElysiumCharactersBukkit) : Comm override fun isInputValid(context: ConversationContext, input: String): Boolean { val conversable = context.forWhom if (conversable is Player) { - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(conversable) for (character in characterProvider.getCharacters(player)) { if (character.name.equals(input, ignoreCase = true)) { @@ -97,8 +97,8 @@ class CharacterSwitchCommand(private val plugin: ElysiumCharactersBukkit) : Comm override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { val conversable = context.forWhom if (conversable is Player) { - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(conversable) var charFound = false // Prioritise exact matches... @@ -127,9 +127,9 @@ class CharacterSwitchCommand(private val plugin: ElysiumCharactersBukkit) : Comm } override fun getPromptText(context: ConversationContext): String { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(context.forWhom as Player) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val characterListBuilder = StringBuilder() for (character in characterProvider.getCharacters(player)) { characterListBuilder.append("\n").append( diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderAddCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderAddCommand.kt index 9d909cedd..1ba57b735 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderAddCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderAddCommand.kt @@ -28,7 +28,7 @@ class GenderAddCommand(private val plugin: ElysiumCharactersBukkit) : CommandExe if (sender is Conversable) { if (sender.hasPermission("elysium.characters.command.gender.add")) { if (args.size > 0) { - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) val genderBuilder = StringBuilder() for (i in 0..args.size - 1 - 1) { genderBuilder.append(args[i]).append(' ') @@ -57,7 +57,7 @@ class GenderAddCommand(private val plugin: ElysiumCharactersBukkit) : CommandExe } override fun isInputValid(context: ConversationContext, input: String): Boolean { - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) return genderProvider.getGender(input) == null } @@ -66,7 +66,7 @@ class GenderAddCommand(private val plugin: ElysiumCharactersBukkit) : CommandExe } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) genderProvider.addGender(BukkitGender(input)) return GenderAddedPrompt() } diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderListCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderListCommand.kt index 0cc2f961c..67f4d7566 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderListCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderListCommand.kt @@ -11,7 +11,7 @@ class GenderListCommand(private val plugin: ElysiumCharactersBukkit) : CommandEx override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender.hasPermission("elysium.characters.command.gender.list")) { - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) sender.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.gender-list-title"))) for (gender in genderProvider.genders) { sender.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.gender-list-item")) diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderRemoveCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderRemoveCommand.kt index 295c00de7..784472415 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderRemoveCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/gender/GenderRemoveCommand.kt @@ -27,7 +27,7 @@ class GenderRemoveCommand(private val plugin: ElysiumCharactersBukkit) : Command if (sender is Conversable) { if (sender.hasPermission("elysium.characters.command.gender.remove")) { if (args.size > 0) { - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) val genderBuilder = StringBuilder() for (i in 0..args.size - 1 - 1) { genderBuilder.append(args[i]).append(' ') @@ -53,11 +53,11 @@ class GenderRemoveCommand(private val plugin: ElysiumCharactersBukkit) : Command private inner class GenderPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java).getGender(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java).getGender(input) != null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) genderProvider.removeGender(genderProvider.getGender(input)!!) return GenderSetPrompt() } diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceAddCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceAddCommand.kt index c15ea2c87..395453706 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceAddCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceAddCommand.kt @@ -28,7 +28,7 @@ class RaceAddCommand(private val plugin: ElysiumCharactersBukkit) : CommandExecu if (sender is Conversable) { if (sender.hasPermission("elysium.characters.command.race.add")) { if (args.size > 0) { - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) val raceBuilder = StringBuilder() for (i in 0..args.size - 1 - 1) { raceBuilder.append(args[i]).append(' ') @@ -57,12 +57,12 @@ class RaceAddCommand(private val plugin: ElysiumCharactersBukkit) : CommandExecu } override fun isInputValid(context: ConversationContext, input: String): Boolean { - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) return raceProvider.getRace(input) == null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) raceProvider.addRace(BukkitRace(input)) return RaceAddedPrompt() } diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceListCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceListCommand.kt index 5709f5b7d..9bb9faf81 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceListCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceListCommand.kt @@ -11,7 +11,7 @@ class RaceListCommand(private val plugin: ElysiumCharactersBukkit) : CommandExec override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender.hasPermission("elysium.characters.command.race.list")) { - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) sender.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.race-list-title"))) for (race in raceProvider.races) { sender.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.race-list-item") diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceRemoveCommand.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceRemoveCommand.kt index 3a889fdac..0152886c9 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceRemoveCommand.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/command/race/RaceRemoveCommand.kt @@ -27,7 +27,7 @@ class RaceRemoveCommand(private val plugin: ElysiumCharactersBukkit) : CommandEx if (sender is Conversable) { if (sender.hasPermission("elysium.characters.command.race.remove")) { if (args.size > 0) { - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) val raceBuilder = StringBuilder() for (i in 0..args.size - 1 - 1) { raceBuilder.append(args[i]).append(' ') @@ -53,11 +53,11 @@ class RaceRemoveCommand(private val plugin: ElysiumCharactersBukkit) : CommandEx private inner class RacePrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java).getRace(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java).getRace(input) != null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) raceProvider.removeRace(raceProvider.getRace(input)!!) return RaceSetPrompt() } diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/database/table/BukkitCharacterTable.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/database/table/BukkitCharacterTable.kt index 5964f3d5d..a0181871b 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/database/table/BukkitCharacterTable.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/database/table/BukkitCharacterTable.kt @@ -289,9 +289,9 @@ class BukkitCharacterTable: Table { database.createConnection().use { connection -> connection.prepareStatement( "SELECT id, player_id, name, gender_id, age, race_id, description, dead, world, x, y, z, yaw, pitch, inventory_contents, helmet, chestplate, leggings, boots, health, max_health, mana, max_mana, food_level, thirst_level FROM bukkit_character WHERE id = ?").use({ statement -> - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val genderProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) - val raceProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val genderProvider = plugin.core.serviceManager.getServiceProvider(BukkitGenderProvider::class.java) + val raceProvider = plugin.core.serviceManager.getServiceProvider(BukkitRaceProvider::class.java) statement.setInt(1, id) val resultSet = statement.executeQuery() if (resultSet.next()) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/gender/BukkitGenderProvider.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/gender/BukkitGenderProvider.kt index 1b34962d2..b4ce93852 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/gender/BukkitGenderProvider.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/gender/BukkitGenderProvider.kt @@ -10,11 +10,11 @@ import java.util.* class BukkitGenderProvider(private val plugin: ElysiumCharactersBukkit) : GenderProvider { override fun getGender(id: Int): BukkitGender? { - return plugin.core!!.database.getTable(BukkitGender::class.java)!![id] + return plugin.core.database.getTable(BukkitGender::class.java)!![id] } override fun getGender(name: String): BukkitGender? { - val table = plugin.core!!.database.getTable(BukkitGender::class.java) + val table = plugin.core.database.getTable(BukkitGender::class.java) if (table is BukkitGenderTable) { return table[name] } @@ -25,7 +25,7 @@ class BukkitGenderProvider(private val plugin: ElysiumCharactersBukkit) : Gender get() { try { var genders: MutableList = ArrayList() - plugin.core!!.database.createConnection().use { connection -> + plugin.core.database.createConnection().use { connection -> connection.prepareStatement( "SELECT id, name FROM bukkit_gender").use({ statement -> val resultSet = statement.executeQuery() @@ -42,11 +42,11 @@ class BukkitGenderProvider(private val plugin: ElysiumCharactersBukkit) : Gender } override fun addGender(gender: BukkitGender) { - plugin.core!!.database.getTable(BukkitGender::class.java)!!.insert(gender) + plugin.core.database.getTable(BukkitGender::class.java)!!.insert(gender) } override fun removeGender(gender: BukkitGender) { - plugin.core!!.database.getTable(BukkitGender::class.java)!!.delete(gender) + plugin.core.database.getTable(BukkitGender::class.java)!!.delete(gender) } } diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerDeathListener.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerDeathListener.kt index c323e3334..55aabe5c6 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerDeathListener.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerDeathListener.kt @@ -11,8 +11,8 @@ class PlayerDeathListener(private val plugin: ElysiumCharactersBukkit) : Listene @EventHandler fun onPlayerDeath(event: PlayerDeathEvent) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(event.entity) val character = characterProvider.getActiveCharacter(player) if (character != null) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerInteractEntityListener.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerInteractEntityListener.kt index fbd0f8617..1c50a137c 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerInteractEntityListener.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerInteractEntityListener.kt @@ -17,8 +17,8 @@ class PlayerInteractEntityListener(private val plugin: ElysiumCharactersBukkit) if (event.rightClicked is Player) { if (event.player.hasPermission("elysium.characters.command.character.card.other")) { val bukkitPlayer = event.rightClicked as Player - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(bukkitPlayer) val character = characterProvider.getActiveCharacter(player) if (character != null) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerMoveListener.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerMoveListener.kt index a4598a045..fb8b3c0fa 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerMoveListener.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/listener/PlayerMoveListener.kt @@ -15,8 +15,8 @@ class PlayerMoveListener(private val plugin: ElysiumCharactersBukkit) : Listener @EventHandler fun onPlayerMove(event: PlayerMoveEvent) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val player = playerProvider.getPlayer(event.player) val character = characterProvider.getActiveCharacter(player) if (character != null && character.isDead) { diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/race/BukkitRaceProvider.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/race/BukkitRaceProvider.kt index 650a0390d..b1f9496f3 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/race/BukkitRaceProvider.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/race/BukkitRaceProvider.kt @@ -10,11 +10,11 @@ import java.util.* class BukkitRaceProvider(private val plugin: ElysiumCharactersBukkit) : RaceProvider { override fun getRace(id: Int): BukkitRace? { - return plugin.core!!.database.getTable(BukkitRace::class.java)!![id] + return plugin.core.database.getTable(BukkitRace::class.java)!![id] } override fun getRace(name: String): BukkitRace? { - val table = plugin.core!!.database.getTable(BukkitRace::class.java) + val table = plugin.core.database.getTable(BukkitRace::class.java) if (table is BukkitRaceTable) { return table[name] } @@ -25,7 +25,7 @@ class BukkitRaceProvider(private val plugin: ElysiumCharactersBukkit) : RaceProv get() { try { var races: MutableList = ArrayList() - plugin.core!!.database.createConnection().use { connection -> + plugin.core.database.createConnection().use { connection -> connection.prepareStatement( "SELECT id, name FROM bukkit_race").use({ statement -> val resultSet = statement.executeQuery() @@ -42,11 +42,11 @@ class BukkitRaceProvider(private val plugin: ElysiumCharactersBukkit) : RaceProv } override fun addRace(race: BukkitRace) { - plugin.core!!.database.getTable(BukkitRace::class.java)!!.insert(race) + plugin.core.database.getTable(BukkitRace::class.java)!!.insert(race) } override fun removeRace(race: BukkitRace) { - plugin.core!!.database.getTable(BukkitRace::class.java)!!.delete(race) + plugin.core.database.getTable(BukkitRace::class.java)!!.delete(race) } } diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/chatchannel/BukkitChatChannelProvider.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/chatchannel/BukkitChatChannelProvider.kt index 8d78cfe5a..43022f744 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/chatchannel/BukkitChatChannelProvider.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/chatchannel/BukkitChatChannelProvider.kt @@ -10,31 +10,31 @@ class BukkitChatChannelProvider(private val plugin: ElysiumChatBukkit) : ChatCha override val chatChannels: Collection get() { - return (plugin.core!!.database.getTable(BukkitChatChannel::class.java) as BukkitChatChannelTable).getAll() + return (plugin.core.database.getTable(BukkitChatChannel::class.java) as BukkitChatChannelTable).getAll() } override fun getChatChannel(id: Int): BukkitChatChannel? { - return plugin.core!!.database.getTable(BukkitChatChannel::class.java)!![id] + return plugin.core.database.getTable(BukkitChatChannel::class.java)!![id] } override fun getChatChannel(name: String): BukkitChatChannel? { - return (plugin.core!!.database.getTable(BukkitChatChannel::class.java) as BukkitChatChannelTable).get(name) + return (plugin.core.database.getTable(BukkitChatChannel::class.java) as BukkitChatChannelTable).get(name) } override fun addChatChannel(chatChannel: BukkitChatChannel) { - plugin.core!!.database.getTable(BukkitChatChannel::class.java)!!.insert(chatChannel) + plugin.core.database.getTable(BukkitChatChannel::class.java)!!.insert(chatChannel) } override fun removeChatChannel(chatChannel: BukkitChatChannel) { - plugin.core!!.database.getTable(BukkitChatChannel::class.java)!!.delete(chatChannel) + plugin.core.database.getTable(BukkitChatChannel::class.java)!!.delete(chatChannel) } override fun updateChatChannel(chatChannel: BukkitChatChannel) { - plugin.core!!.database.getTable(BukkitChatChannel::class.java)!!.update(chatChannel) + plugin.core.database.getTable(BukkitChatChannel::class.java)!!.update(chatChannel) } override fun getPlayerChannel(player: ElysiumPlayer): BukkitChatChannel? { - return (plugin.core!!.database.getTable(BukkitChatChannel::class.java) as BukkitChatChannelTable).get(player) + return (plugin.core.database.getTable(BukkitChatChannel::class.java) as BukkitChatChannelTable).get(player) } override fun setPlayerChannel(player: ElysiumPlayer, channel: BukkitChatChannel) { diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/chatchannel/pipeline/BukkitFormatChatChannelPipelineComponent.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/chatchannel/pipeline/BukkitFormatChatChannelPipelineComponent.kt index fff752b79..e87a51bc5 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/chatchannel/pipeline/BukkitFormatChatChannelPipelineComponent.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/chatchannel/pipeline/BukkitFormatChatChannelPipelineComponent.kt @@ -16,7 +16,7 @@ class BukkitFormatChatChannelPipelineComponent(private val plugin: ElysiumChatBu @Throws(ChatChannelMessageFormattingFailureException::class) override fun process(message: String, context: ChatMessageContext): String? { - val characterProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) + val characterProvider = plugin.core.serviceManager.getServiceProvider(BukkitCharacterProvider::class.java) val sender = context.sender val receiver = context.receiver val senderCharacter = characterProvider.getActiveCharacter(sender) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelCreateCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelCreateCommand.kt index 99e1deb32..5bf2e824a 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelCreateCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelCreateCommand.kt @@ -51,7 +51,7 @@ class ChatChannelCreateCommand(private val plugin: ElysiumChatBukkit) : CommandE } override fun isInputValid(context: ConversationContext, input: String): Boolean { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) return chatChannelProvider.getChatChannel(input) == null } @@ -364,7 +364,7 @@ class ChatChannelCreateCommand(private val plugin: ElysiumChatBukkit) : CommandE } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val name = context.getSessionData("name") as String val color = context.getSessionData("color") as Color val formatString = context.getSessionData("format_string") as String diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelDeleteCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelDeleteCommand.kt index 2aa7ec59d..5084e5573 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelDeleteCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelDeleteCommand.kt @@ -26,7 +26,7 @@ class ChatChannelDeleteCommand(private val plugin: ElysiumChatBukkit) : CommandE override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Conversable) { if (sender.hasPermission("elysium.chat.command.chatchannel.delete")) { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) if (chatChannelProvider.chatChannels.size > 0) { if (args.size > 0) { val chatChannelBuilder = StringBuilder() @@ -57,13 +57,13 @@ class ChatChannelDeleteCommand(private val plugin: ElysiumChatBukkit) : CommandE private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { val conversable = context.forWhom if (conversable is Player) { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val channel = chatChannelProvider.getChatChannel(input)!! chatChannelProvider.removeChatChannel(channel) } diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelJoinCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelJoinCommand.kt index 879fa0afd..abf2f50e9 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelJoinCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelJoinCommand.kt @@ -27,8 +27,8 @@ class ChatChannelJoinCommand(private val plugin: ElysiumChatBukkit) : CommandExe override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) if (chatChannelProvider.chatChannels.size > 0) { val player = playerProvider.getPlayer(sender) if (args.size > 0) { @@ -65,14 +65,14 @@ class ChatChannelJoinCommand(private val plugin: ElysiumChatBukkit) : CommandExe private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val player = playerProvider.getPlayer(conversable) val channel = chatChannelProvider.getChatChannel(input)!! channel.addListener(player) @@ -86,7 +86,7 @@ class ChatChannelJoinCommand(private val plugin: ElysiumChatBukkit) : CommandExe } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val channelListBuilder = StringBuilder() for (channel in chatChannelProvider.chatChannels) { channelListBuilder.append(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.chatchannel-list-item") diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelLeaveCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelLeaveCommand.kt index 5337b366b..4cdf029b1 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelLeaveCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelLeaveCommand.kt @@ -27,8 +27,8 @@ class ChatChannelLeaveCommand(private val plugin: ElysiumChatBukkit) : CommandEx override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.chat.command.chatchannel.leave")) { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) if (chatChannelProvider.chatChannels.size > 0) { val player = playerProvider.getPlayer(sender) if (args.size > 0) { @@ -69,14 +69,14 @@ class ChatChannelLeaveCommand(private val plugin: ElysiumChatBukkit) : CommandEx private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val player = playerProvider.getPlayer(conversable) val channel = chatChannelProvider.getChatChannel(input)!! channel.removeListener(player) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelListCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelListCommand.kt index 05dc3870f..b1f371e5a 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelListCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelListCommand.kt @@ -13,7 +13,7 @@ class ChatChannelListCommand(private val plugin: ElysiumChatBukkit) : CommandExe override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender.hasPermission("elysium.chat.command.chatchannel.list")) { sender.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.chatchannel-list-title"))) - for (channel in plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).chatChannels) { + for (channel in plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).chatChannels) { sender.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.chatchannel-list-item")) .replace("\$color", ChatColorUtils.closestChatColorToColor(channel.color).toString()) .replace("\$name", channel.name)) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetClearRadiusCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetClearRadiusCommand.kt index e2554bd8e..bc39626d5 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetClearRadiusCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetClearRadiusCommand.kt @@ -39,7 +39,7 @@ class ChatChannelSetClearRadiusCommand(private val plugin: ElysiumChatBukkit) : private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun getFailedValidationText(context: ConversationContext?, invalidInput: String?): String { @@ -77,7 +77,7 @@ class ChatChannelSetClearRadiusCommand(private val plugin: ElysiumChatBukkit) : } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val chatChannel = chatChannelProvider.getChatChannel(context.getSessionData("channel") as String)!! chatChannel.clearRadius = context.getSessionData("clear_radius") as Int chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetColorCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetColorCommand.kt index 5028de436..51eedafca 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetColorCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetColorCommand.kt @@ -41,7 +41,7 @@ class ChatChannelSetColorCommand(private val plugin: ElysiumChatBukkit) : Comman private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun getFailedValidationText(context: ConversationContext?, invalidInput: String?): String { @@ -93,7 +93,7 @@ class ChatChannelSetColorCommand(private val plugin: ElysiumChatBukkit) : Comman } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val chatChannel = chatChannelProvider.getChatChannel(context.getSessionData("channel") as String)!! chatChannel.color = context.getSessionData("color") as Color chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetFormatCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetFormatCommand.kt index 22a3b8f3a..0ee9df50f 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetFormatCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetFormatCommand.kt @@ -26,7 +26,7 @@ class ChatChannelSetFormatCommand(private val plugin: ElysiumChatBukkit) : Comma override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.chat.command.chatchannel.set.format")) { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) if (args.size > 0) { val chatChannel = chatChannelProvider.getChatChannel(args[0]) if (chatChannel != null) { @@ -53,7 +53,7 @@ class ChatChannelSetFormatCommand(private val plugin: ElysiumChatBukkit) : Comma private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun getFailedValidationText(context: ConversationContext?, invalidInput: String?): String { @@ -91,7 +91,7 @@ class ChatChannelSetFormatCommand(private val plugin: ElysiumChatBukkit) : Comma } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val chatChannel = chatChannelProvider.getChatChannel(context.getSessionData("channel") as String)!! chatChannel.formatString = context.getSessionData("format_string") as String chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCChannelCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCChannelCommand.kt index 0e3fba017..7de9e6b4c 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCChannelCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCChannelCommand.kt @@ -39,7 +39,7 @@ class ChatChannelSetIRCChannelCommand(private val plugin: ElysiumChatBukkit) : C private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun getFailedValidationText(context: ConversationContext?, invalidInput: String?): String { @@ -85,7 +85,7 @@ class ChatChannelSetIRCChannelCommand(private val plugin: ElysiumChatBukkit) : C } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val chatChannel = chatChannelProvider.getChatChannel(context.getSessionData("channel") as String)!! chatChannel.ircChannel = context.getSessionData("irc_channel") as String chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCEnabledCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCEnabledCommand.kt index d024c8cdc..028424dff 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCEnabledCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCEnabledCommand.kt @@ -39,7 +39,7 @@ class ChatChannelSetIRCEnabledCommand(private val plugin: ElysiumChatBukkit) : C private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun getFailedValidationText(context: ConversationContext?, invalidInput: String?): String { @@ -81,7 +81,7 @@ class ChatChannelSetIRCEnabledCommand(private val plugin: ElysiumChatBukkit) : C } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val chatChannel = chatChannelProvider.getChatChannel(context.getSessionData("channel") as String)!! chatChannel.isIRCEnabled = context.getSessionData("irc_enabled") as Boolean chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCWhitelistCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCWhitelistCommand.kt index 1e920a95e..9008f98cd 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCWhitelistCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetIRCWhitelistCommand.kt @@ -39,7 +39,7 @@ class ChatChannelSetIRCWhitelistCommand(private val plugin: ElysiumChatBukkit) : private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun getFailedValidationText(context: ConversationContext?, invalidInput: String?): String { @@ -82,7 +82,7 @@ class ChatChannelSetIRCWhitelistCommand(private val plugin: ElysiumChatBukkit) : } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val chatChannel = chatChannelProvider.getChatChannel(context.getSessionData("channel") as String)!! chatChannel.isIRCWhitelist = context.getSessionData("irc_whitelist") as Boolean chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetJoinedByDefaultCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetJoinedByDefaultCommand.kt index 21e53f294..14660b1e8 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetJoinedByDefaultCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetJoinedByDefaultCommand.kt @@ -39,7 +39,7 @@ class ChatChannelSetJoinedByDefaultCommand(private val plugin: ElysiumChatBukkit private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun getFailedValidationText(context: ConversationContext?, invalidInput: String?): String { @@ -81,7 +81,7 @@ class ChatChannelSetJoinedByDefaultCommand(private val plugin: ElysiumChatBukkit } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val chatChannel = chatChannelProvider.getChatChannel(context.getSessionData("channel") as String)!! chatChannel.isJoinedByDefault = context.getSessionData("joined_by_default") as Boolean chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetMatchPatternCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetMatchPatternCommand.kt index 30d3ed8f3..6afb94e2a 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetMatchPatternCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetMatchPatternCommand.kt @@ -39,7 +39,7 @@ class ChatChannelSetMatchPatternCommand(private val plugin: ElysiumChatBukkit) : private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun getFailedValidationText(context: ConversationContext?, invalidInput: String?): String { @@ -80,7 +80,7 @@ class ChatChannelSetMatchPatternCommand(private val plugin: ElysiumChatBukkit) : } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val chatChannel = chatChannelProvider.getChatChannel(context.getSessionData("channel") as String)!! chatChannel.matchPattern = context.getSessionData("match_pattern") as String chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetNameCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetNameCommand.kt index c8e029536..38cce8c9f 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetNameCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetNameCommand.kt @@ -39,7 +39,7 @@ class ChatChannelSetNameCommand(private val plugin: ElysiumChatBukkit) : Command private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun getFailedValidationText(context: ConversationContext?, invalidInput: String?): String { @@ -64,7 +64,7 @@ class ChatChannelSetNameCommand(private val plugin: ElysiumChatBukkit) : Command } override fun isInputValid(context: ConversationContext, input: String): Boolean { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) return chatChannelProvider.getChatChannel(input) == null } @@ -86,7 +86,7 @@ class ChatChannelSetNameCommand(private val plugin: ElysiumChatBukkit) : Command } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val chatChannel = chatChannelProvider.getChatChannel(context.getSessionData("channel") as String)!! chatChannel.name = context.getSessionData("name") as String chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetRadiusCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetRadiusCommand.kt index 0e81be32c..c26127468 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetRadiusCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSetRadiusCommand.kt @@ -39,7 +39,7 @@ class ChatChannelSetRadiusCommand(private val plugin: ElysiumChatBukkit) : Comma private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun getFailedValidationText(context: ConversationContext?, invalidInput: String?): String { @@ -77,7 +77,7 @@ class ChatChannelSetRadiusCommand(private val plugin: ElysiumChatBukkit) : Comma } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val chatChannel = chatChannelProvider.getChatChannel(context.getSessionData("channel") as String)!! chatChannel.radius = context.getSessionData("radius") as Int chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSpeakCommand.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSpeakCommand.kt index 9ca9b6a71..b1787d09b 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSpeakCommand.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/command/chatchannel/ChatChannelSpeakCommand.kt @@ -29,8 +29,8 @@ class ChatChannelSpeakCommand(private val plugin: ElysiumChatBukkit) : CommandEx override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { if (sender is Player) { if (sender.hasPermission("elysium.chat.command.chatchannel.speak")) { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) if (chatChannelProvider.chatChannels.size > 0) { val player = playerProvider.getPlayer(sender) if (args.size > 0) { @@ -76,14 +76,14 @@ class ChatChannelSpeakCommand(private val plugin: ElysiumChatBukkit) : CommandEx private inner class ChatChannelPrompt : ValidatingPrompt() { override fun isInputValid(context: ConversationContext, input: String): Boolean { - return plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null + return plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java).getChatChannel(input) != null } override fun acceptValidatedInput(context: ConversationContext, input: String): Prompt { val conversable = context.forWhom if (conversable is Player) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val player = playerProvider.getPlayer(conversable) val channel = chatChannelProvider.getChatChannel(input)!! val oldChannel = chatChannelProvider.getPlayerChannel(player) @@ -104,7 +104,7 @@ class ChatChannelSpeakCommand(private val plugin: ElysiumChatBukkit) : CommandEx } override fun getPromptText(context: ConversationContext): String { - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val channelListBuilder = StringBuilder() for (channel in chatChannelProvider.chatChannels) { channelListBuilder.append(ChatColor.translateAlternateColorCodes('&', plugin.config.getString("messages.chatchannel-list-item") diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/database/table/BukkitChatChannelTable.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/database/table/BukkitChatChannelTable.kt index bd24f6406..5fc546f64 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/database/table/BukkitChatChannelTable.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/database/table/BukkitChatChannelTable.kt @@ -326,7 +326,7 @@ class BukkitChatChannelTable: Table { } else { var chatChannel: BukkitChatChannel? = null try { - plugin.core!!.database.createConnection().use { connection -> + plugin.core.database.createConnection().use { connection -> connection.prepareStatement("SELECT id, name, color_red, color_green, color_blue, format_string, radius, clear_radius, match_pattern, irc_enabled, irc_channel, irc_whitelist, joined_by_default FROM bukkit_chat_channel WHERE name = ?").use({ statement -> statement.setString(1, name) val resultSet = statement.executeQuery() @@ -355,14 +355,14 @@ class BukkitChatChannelTable: Table { listenerStatement.setInt(1, finalChatChannel.id) val listenerResultSet = listenerStatement.executeQuery() while (listenerResultSet.next()) { - finalChatChannel.addListener(plugin.core!!.database.getTable(BukkitPlayer::class.java)!![listenerResultSet.getInt("player_id")]!!) + finalChatChannel.addListener(plugin.core.database.getTable(BukkitPlayer::class.java)!![listenerResultSet.getInt("player_id")]!!) } }) connection.prepareStatement("SELECT player_id FROM chat_channel_speaker WHERE chat_channel_id = ?").use({ speakerStatement -> speakerStatement.setInt(1, finalChatChannel.id) val speakerResultSet = speakerStatement.executeQuery() while (speakerResultSet.next()) { - finalChatChannel.addSpeaker(plugin.core!!.database.getTable(BukkitPlayer::class.java)!![speakerResultSet.getInt("player_id")]!!) + finalChatChannel.addSpeaker(plugin.core.database.getTable(BukkitPlayer::class.java)!![speakerResultSet.getInt("player_id")]!!) } }) cache.put(finalChatChannel.id as Integer, chatChannel) @@ -387,7 +387,7 @@ class BukkitChatChannelTable: Table { } else { try { var chatChannel: BukkitChatChannel? = null - plugin.core!!.database.createConnection().use { connection -> + plugin.core.database.createConnection().use { connection -> connection.prepareStatement("SELECT id, name, color_red, color_green, color_blue, format_string, radius, clear_radius, match_pattern, irc_enabled, irc_channel, irc_whitelist, joined_by_default FROM bukkit_chat_channel, chat_channel_speaker WHERE chat_channel_speaker.player_id = ? AND chat_channel_speaker.chat_channel_id = bukkit_chat_channel.id").use({ statement -> statement.setInt(1, player.id) val resultSet = statement.executeQuery() @@ -416,14 +416,14 @@ class BukkitChatChannelTable: Table { listenerStatement.setInt(1, finalChatChannel.id) val listenerResultSet = listenerStatement.executeQuery() while (listenerResultSet.next()) { - finalChatChannel.addListener(plugin.core!!.database.getTable(BukkitPlayer::class.java)!![listenerResultSet.getInt("player_id")]!!) + finalChatChannel.addListener(plugin.core.database.getTable(BukkitPlayer::class.java)!![listenerResultSet.getInt("player_id")]!!) } }) connection.prepareStatement("SELECT player_id FROM chat_channel_speaker WHERE chat_channel_id = ?").use({ speakerStatement -> speakerStatement.setInt(1, finalChatChannel.id) val speakerResultSet = speakerStatement.executeQuery() while (speakerResultSet.next()) { - finalChatChannel.addSpeaker(plugin.core!!.database.getTable(BukkitPlayer::class.java)!![speakerResultSet.getInt("player_id")]!!) + finalChatChannel.addSpeaker(plugin.core.database.getTable(BukkitPlayer::class.java)!![speakerResultSet.getInt("player_id")]!!) } }) cache.put(finalChatChannel.id as Integer, chatChannel) @@ -444,7 +444,7 @@ class BukkitChatChannelTable: Table { fun getAll(): Collection { val chatChannels = ArrayList() try { - plugin.core!!.database.createConnection().use { connection -> + plugin.core.database.createConnection().use { connection -> connection.prepareStatement("SELECT id FROM bukkit_chat_channel").use({ statement -> val resultSet = statement.executeQuery() while (resultSet.next()) { @@ -454,14 +454,14 @@ class BukkitChatChannelTable: Table { listenerStatement.setInt(1, chatChannel.id) val listenerResultSet = listenerStatement.executeQuery() while (listenerResultSet.next()) { - chatChannel.addListener(plugin.core!!.database.getTable(BukkitPlayer::class.java)!![listenerResultSet.getInt("player_id")]!!) + chatChannel.addListener(plugin.core.database.getTable(BukkitPlayer::class.java)!![listenerResultSet.getInt("player_id")]!!) } }) connection.prepareStatement("SELECT player_id FROM chat_channel_speaker WHERE chat_channel_id = ?").use({ speakerStatement -> speakerStatement.setInt(1, chatChannel.id) val speakerResultSet = speakerStatement.executeQuery() while (speakerResultSet.next()) { - chatChannel.addSpeaker(plugin.core!!.database.getTable(BukkitPlayer::class.java)!![speakerResultSet.getInt("player_id")]!!) + chatChannel.addSpeaker(plugin.core.database.getTable(BukkitPlayer::class.java)!![speakerResultSet.getInt("player_id")]!!) } }) cache.put(chatChannel.id as Integer, chatChannel) diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/listener/AsyncPlayerChatListener.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/listener/AsyncPlayerChatListener.kt index 6501a79ee..a878f56ed 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/listener/AsyncPlayerChatListener.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/listener/AsyncPlayerChatListener.kt @@ -18,8 +18,8 @@ class AsyncPlayerChatListener(private val plugin: ElysiumChatBukkit) : Listener fun onAsyncPlayerChat(event: AsyncPlayerChatEvent) { event.isCancelled = true val bukkitPlayer = event.player - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) val player = playerProvider.getPlayer(bukkitPlayer) var channel: BukkitChatChannel? = chatChannelProvider.getPlayerChannel(player) var message = event.message diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/listener/PlayerJoinListener.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/listener/PlayerJoinListener.kt index 0611042de..e0788d9ea 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/listener/PlayerJoinListener.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/listener/PlayerJoinListener.kt @@ -12,9 +12,9 @@ class PlayerJoinListener(private val plugin: ElysiumChatBukkit) : Listener { @EventHandler fun onPlayerJoin(event: PlayerJoinEvent) { if (!event.player.hasPlayedBefore()) { - val playerProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) + val playerProvider = plugin.core.serviceManager.getServiceProvider(BukkitPlayerProvider::class.java) val player = playerProvider.getPlayer(event.player) - val chatChannelProvider = plugin.core!!.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) + val chatChannelProvider = plugin.core.serviceManager.getServiceProvider(BukkitChatChannelProvider::class.java) chatChannelProvider.chatChannels.filter { it -> it.isJoinedByDefault }.forEach({ chatChannel -> chatChannel.addListener(player) chatChannelProvider.updateChatChannel(chatChannel) diff --git a/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt b/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt index b12729878..00c735310 100644 --- a/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt +++ b/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt @@ -16,7 +16,7 @@ class ElysiumCoreBukkit : ElysiumBukkitPlugin() { saveDefaultConfig() core = ElysiumCore(logger, Database(config.getString("database.url"), config.getString("database.username"), config.getString("database.password"))) try { - createTables(core!!.database) + createTables(core.database) } catch (exception: SQLException) { exception.printStackTrace() } @@ -33,14 +33,14 @@ class ElysiumCoreBukkit : ElysiumBukkitPlugin() { fun registerServiceProviders(plugin: ElysiumBukkitPlugin) { for (provider in plugin.serviceProviders!!) { - core!!.serviceManager.registerServiceProvider(provider) + core.serviceManager.registerServiceProvider(provider) } } fun initializePlugin(elysiumBukkitPlugin: ElysiumBukkitPlugin) { elysiumBukkitPlugin.core = core try { - elysiumBukkitPlugin.createTables(core!!.database) + elysiumBukkitPlugin.createTables(core.database) } catch (exception: SQLException) { exception.printStackTrace() } diff --git a/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/BukkitPlayerProvider.kt b/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/BukkitPlayerProvider.kt index e81e39acc..8fdc64646 100644 --- a/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/BukkitPlayerProvider.kt +++ b/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/BukkitPlayerProvider.kt @@ -8,11 +8,11 @@ import org.bukkit.OfflinePlayer class BukkitPlayerProvider(private val plugin: ElysiumPlayersBukkit) : PlayerProvider { override fun getPlayer(id: Int): BukkitPlayer? { - return plugin.core!!.database.getTable(BukkitPlayer::class.java)!![id] + return plugin.core.database.getTable(BukkitPlayer::class.java)!![id] } fun getPlayer(bukkitPlayer: OfflinePlayer): BukkitPlayer { - val table = plugin.core!!.database.getTable(BukkitPlayer::class.java) + val table = plugin.core.database.getTable(BukkitPlayer::class.java) var player = (table as BukkitPlayerTable)[bukkitPlayer] if (player == null) { player = BukkitPlayer(bukkitPlayer) @@ -22,12 +22,12 @@ class BukkitPlayerProvider(private val plugin: ElysiumPlayersBukkit) : PlayerPro } override fun addPlayer(player: BukkitPlayer) { - val bukkitPlayerTable: Table = plugin.core!!.database.getTable(BukkitPlayer::class.java) as Table + val bukkitPlayerTable: Table = plugin.core.database.getTable(BukkitPlayer::class.java) as Table bukkitPlayerTable.insert(player) } override fun removePlayer(player: BukkitPlayer) { - plugin.core!!.database.getTable(BukkitPlayer::class.java)!!.delete(player) + plugin.core.database.getTable(BukkitPlayer::class.java)!!.delete(player) } } From c9cc544b02ddc010058abc2500ad6c054295d354 Mon Sep 17 00:00:00 2001 From: Ross Binden Date: Tue, 3 May 2016 22:26:50 +0100 Subject: [PATCH 2/3] Make serviceProviders lateinit for #10 --- .../elysium/characters/bukkit/ElysiumCharactersBukkit.kt | 2 +- .../com/seventh_root/elysium/chat/bukkit/ElysiumChatBukkit.kt | 2 +- .../com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt | 2 +- .../elysium/core/bukkit/plugin/ElysiumBukkitPlugin.kt | 2 +- .../seventh_root/elysium/economy/bukkit/ElysiumEconomyBukkit.kt | 2 +- .../seventh_root/elysium/players/bukkit/ElysiumPlayersBukkit.kt | 2 +- .../com/seventh_root/elysium/trade/bukkit/ElysiumTradeBukkit.kt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/ElysiumCharactersBukkit.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/ElysiumCharactersBukkit.kt index 579a2c2c5..8d15fc066 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/ElysiumCharactersBukkit.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/ElysiumCharactersBukkit.kt @@ -28,7 +28,7 @@ class ElysiumCharactersBukkit : ElysiumBukkitPlugin() { private var characterProvider: CharacterProvider? = null private var genderProvider: GenderProvider? = null private var raceProvider: RaceProvider? = null - override var serviceProviders: Array? = null + override lateinit var serviceProviders: Array override fun onEnable() { saveDefaultConfig() diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/ElysiumChatBukkit.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/ElysiumChatBukkit.kt index 66e7c16cf..dbcd5d207 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/ElysiumChatBukkit.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/ElysiumChatBukkit.kt @@ -15,7 +15,7 @@ import java.sql.SQLException class ElysiumChatBukkit : ElysiumBukkitPlugin() { private var chatChannelProvider: ChatChannelProvider? = null - override var serviceProviders: Array? = null + override lateinit var serviceProviders: Array override fun onEnable() { saveDefaultConfig() diff --git a/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt b/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt index 00c735310..4f0354169 100644 --- a/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt +++ b/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt @@ -10,7 +10,7 @@ import java.sql.SQLException class ElysiumCoreBukkit : ElysiumBukkitPlugin() { - override var serviceProviders: Array? = null + override lateinit var serviceProviders: Array override fun onEnable() { saveDefaultConfig() diff --git a/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/plugin/ElysiumBukkitPlugin.kt b/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/plugin/ElysiumBukkitPlugin.kt index 4a7204fa4..65f7f13d2 100644 --- a/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/plugin/ElysiumBukkitPlugin.kt +++ b/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/plugin/ElysiumBukkitPlugin.kt @@ -30,6 +30,6 @@ abstract class ElysiumBukkitPlugin : JavaPlugin() { open fun createTables(database: Database) { } - abstract var serviceProviders: Array? + abstract var serviceProviders: Array } diff --git a/bukkit/elysium-economy-bukkit/src/main/kotlin/com/seventh_root/elysium/economy/bukkit/ElysiumEconomyBukkit.kt b/bukkit/elysium-economy-bukkit/src/main/kotlin/com/seventh_root/elysium/economy/bukkit/ElysiumEconomyBukkit.kt index 3edc00208..514a7a984 100644 --- a/bukkit/elysium-economy-bukkit/src/main/kotlin/com/seventh_root/elysium/economy/bukkit/ElysiumEconomyBukkit.kt +++ b/bukkit/elysium-economy-bukkit/src/main/kotlin/com/seventh_root/elysium/economy/bukkit/ElysiumEconomyBukkit.kt @@ -21,7 +21,7 @@ class ElysiumEconomyBukkit : ElysiumBukkitPlugin() { private var currencyProvider: CurrencyProvider? = null private var economyProvider: EconomyProvider? = null - override var serviceProviders: Array? = null + override lateinit var serviceProviders: Array override fun onEnable() { saveDefaultConfig() diff --git a/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/ElysiumPlayersBukkit.kt b/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/ElysiumPlayersBukkit.kt index 0231cb68f..06831dfda 100644 --- a/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/ElysiumPlayersBukkit.kt +++ b/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/ElysiumPlayersBukkit.kt @@ -10,7 +10,7 @@ import java.sql.SQLException class ElysiumPlayersBukkit : ElysiumBukkitPlugin() { private var playerProvider: PlayerProvider? = null - override var serviceProviders: Array? = null + override lateinit var serviceProviders: Array override fun onEnable() { playerProvider = BukkitPlayerProvider(this) diff --git a/bukkit/elysium-trade-bukkit/src/main/kotlin/com/seventh_root/elysium/trade/bukkit/ElysiumTradeBukkit.kt b/bukkit/elysium-trade-bukkit/src/main/kotlin/com/seventh_root/elysium/trade/bukkit/ElysiumTradeBukkit.kt index b26c13a90..d162bbfa5 100644 --- a/bukkit/elysium-trade-bukkit/src/main/kotlin/com/seventh_root/elysium/trade/bukkit/ElysiumTradeBukkit.kt +++ b/bukkit/elysium-trade-bukkit/src/main/kotlin/com/seventh_root/elysium/trade/bukkit/ElysiumTradeBukkit.kt @@ -8,7 +8,7 @@ import com.seventh_root.elysium.trade.bukkit.listener.SignChangeListener class ElysiumTradeBukkit: ElysiumBukkitPlugin() { - override var serviceProviders: Array? = null + override lateinit var serviceProviders: Array override fun onEnable() { saveDefaultConfig() From de83ea6f30fa69b1e43df6dfa97073fe4eb58a2c Mon Sep 17 00:00:00 2001 From: Ross Binden Date: Tue, 3 May 2016 22:37:13 +0100 Subject: [PATCH 3/3] Various other misc lateinit variables, closes #10 --- .../elysium/banks/bukkit/ElysiumBanksBukkit.kt | 2 +- .../characters/bukkit/ElysiumCharactersBukkit.kt | 12 ++++++------ .../bukkit/database/table/BukkitGenderTable.kt | 2 +- .../elysium/chat/bukkit/ElysiumChatBukkit.kt | 4 ++-- .../elysium/core/bukkit/ElysiumCoreBukkit.kt | 2 +- .../elysium/economy/bukkit/ElysiumEconomyBukkit.kt | 8 ++++---- .../elysium/players/bukkit/ElysiumPlayersBukkit.kt | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bukkit/elysium-banks-bukkit/src/main/kotlin/com/seventh_root/elysium/banks/bukkit/ElysiumBanksBukkit.kt b/bukkit/elysium-banks-bukkit/src/main/kotlin/com/seventh_root/elysium/banks/bukkit/ElysiumBanksBukkit.kt index 173427ce7..f3ba154c5 100644 --- a/bukkit/elysium-banks-bukkit/src/main/kotlin/com/seventh_root/elysium/banks/bukkit/ElysiumBanksBukkit.kt +++ b/bukkit/elysium-banks-bukkit/src/main/kotlin/com/seventh_root/elysium/banks/bukkit/ElysiumBanksBukkit.kt @@ -6,7 +6,7 @@ import com.seventh_root.elysium.core.service.ServiceProvider class ElysiumBanksBukkit : ElysiumBukkitPlugin() { - override var serviceProviders: Array? = null + override lateinit var serviceProviders: Array } \ No newline at end of file diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/ElysiumCharactersBukkit.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/ElysiumCharactersBukkit.kt index 8d15fc066..05d7f25d4 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/ElysiumCharactersBukkit.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/ElysiumCharactersBukkit.kt @@ -25,9 +25,9 @@ import java.sql.SQLException class ElysiumCharactersBukkit : ElysiumBukkitPlugin() { - private var characterProvider: CharacterProvider? = null - private var genderProvider: GenderProvider? = null - private var raceProvider: RaceProvider? = null + private lateinit var characterProvider: CharacterProvider + private lateinit var genderProvider: GenderProvider + private lateinit var raceProvider: RaceProvider override lateinit var serviceProviders: Array override fun onEnable() { @@ -36,9 +36,9 @@ class ElysiumCharactersBukkit : ElysiumBukkitPlugin() { genderProvider = BukkitGenderProvider(this) raceProvider = BukkitRaceProvider(this) serviceProviders = arrayOf( - characterProvider as CharacterProvider, - genderProvider as GenderProvider, - raceProvider as BukkitRaceProvider + characterProvider, + genderProvider, + raceProvider ) } diff --git a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/database/table/BukkitGenderTable.kt b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/database/table/BukkitGenderTable.kt index bab602098..c5775fbb7 100644 --- a/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/database/table/BukkitGenderTable.kt +++ b/bukkit/elysium-characters-bukkit/src/main/kotlin/com/seventh_root/elysium/characters/bukkit/database/table/BukkitGenderTable.kt @@ -106,7 +106,7 @@ class BukkitGenderTable: Table { override fun get(id: Int): BukkitGender? { if (cache.containsKey(id as Integer)) { - return cache.get(id as Integer) + return cache.get(id) } else { try { var gender: BukkitGender? = null diff --git a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/ElysiumChatBukkit.kt b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/ElysiumChatBukkit.kt index dbcd5d207..7b3922b37 100644 --- a/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/ElysiumChatBukkit.kt +++ b/bukkit/elysium-chat-bukkit/src/main/kotlin/com/seventh_root/elysium/chat/bukkit/ElysiumChatBukkit.kt @@ -14,13 +14,13 @@ import java.sql.SQLException class ElysiumChatBukkit : ElysiumBukkitPlugin() { - private var chatChannelProvider: ChatChannelProvider? = null + private lateinit var chatChannelProvider: ChatChannelProvider override lateinit var serviceProviders: Array override fun onEnable() { saveDefaultConfig() chatChannelProvider = BukkitChatChannelProvider(this) - serviceProviders = arrayOf(chatChannelProvider!!) + serviceProviders = arrayOf(chatChannelProvider) } override fun registerCommands() { diff --git a/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt b/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt index 4f0354169..c44a77d80 100644 --- a/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt +++ b/bukkit/elysium-core-bukkit/src/main/kotlin/com/seventh_root/elysium/core/bukkit/ElysiumCoreBukkit.kt @@ -32,7 +32,7 @@ class ElysiumCoreBukkit : ElysiumBukkitPlugin() { } fun registerServiceProviders(plugin: ElysiumBukkitPlugin) { - for (provider in plugin.serviceProviders!!) { + for (provider in plugin.serviceProviders) { core.serviceManager.registerServiceProvider(provider) } } diff --git a/bukkit/elysium-economy-bukkit/src/main/kotlin/com/seventh_root/elysium/economy/bukkit/ElysiumEconomyBukkit.kt b/bukkit/elysium-economy-bukkit/src/main/kotlin/com/seventh_root/elysium/economy/bukkit/ElysiumEconomyBukkit.kt index 514a7a984..e437413cb 100644 --- a/bukkit/elysium-economy-bukkit/src/main/kotlin/com/seventh_root/elysium/economy/bukkit/ElysiumEconomyBukkit.kt +++ b/bukkit/elysium-economy-bukkit/src/main/kotlin/com/seventh_root/elysium/economy/bukkit/ElysiumEconomyBukkit.kt @@ -19,8 +19,8 @@ import com.seventh_root.elysium.economy.bukkit.listener.InventoryCloseListener class ElysiumEconomyBukkit : ElysiumBukkitPlugin() { - private var currencyProvider: CurrencyProvider? = null - private var economyProvider: EconomyProvider? = null + private lateinit var currencyProvider: CurrencyProvider + private lateinit var economyProvider: EconomyProvider override lateinit var serviceProviders: Array override fun onEnable() { @@ -28,8 +28,8 @@ class ElysiumEconomyBukkit : ElysiumBukkitPlugin() { currencyProvider = BukkitCurrencyProvider(this) economyProvider = BukkitEconomyProvider(this) serviceProviders = arrayOf( - currencyProvider as CurrencyProvider, - economyProvider as EconomyProvider + currencyProvider, + economyProvider ) } diff --git a/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/ElysiumPlayersBukkit.kt b/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/ElysiumPlayersBukkit.kt index 06831dfda..3120e2f1c 100644 --- a/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/ElysiumPlayersBukkit.kt +++ b/bukkit/elysium-players-bukkit/src/main/kotlin/com/seventh_root/elysium/players/bukkit/ElysiumPlayersBukkit.kt @@ -9,12 +9,12 @@ import java.sql.SQLException class ElysiumPlayersBukkit : ElysiumBukkitPlugin() { - private var playerProvider: PlayerProvider? = null + private lateinit var playerProvider: PlayerProvider override lateinit var serviceProviders: Array override fun onEnable() { playerProvider = BukkitPlayerProvider(this) - serviceProviders = arrayOf(playerProvider as PlayerProvider) + serviceProviders = arrayOf(playerProvider) } @Throws(SQLException::class)