From 159a3b88caec38d7c19ea2be24728ae77ccb9db1 Mon Sep 17 00:00:00 2001 From: Deltric Date: Mon, 15 Aug 2022 08:56:14 -0500 Subject: [PATCH] Remove sendServerMessage extension --- .../common/api/drop/ItemDropEntry.kt | 2 +- .../common/api/storage/party/PlayerPartyStore.kt | 6 +++--- .../pokemoncobbled/common/battles/BattleBuilder.kt | 2 +- .../net/battle/ChallengeNotificationHandler.kt | 2 +- .../common/command/CheckSpawnsCommand.kt | 8 ++++---- .../pokemoncobbled/common/command/GetNBT.kt | 2 +- .../common/entity/pokeball/EmptyPokeBallEntity.kt | 14 +++++++------- .../common/net/serverhandling/ChallengeHandler.kt | 2 +- .../battle/BattleSelectActionsHandler.kt | 2 +- .../starter/RequestStarterScreenHandler.kt | 4 ++-- .../pokemoncobbled/common/pokemon/Pokemon.kt | 6 +++--- .../common/starter/CobbledStarterHandler.kt | 8 ++++---- .../pokemoncobbled/common/util/PlayerExtensions.kt | 7 +------ .../world/level/block/HealingMachineBlock.kt | 10 +++++----- .../block/entity/HealingMachineBlockEntity.kt | 2 +- 15 files changed, 36 insertions(+), 41 deletions(-) diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/api/drop/ItemDropEntry.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/api/drop/ItemDropEntry.kt index 35b3c2da94..7522b75173 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/api/drop/ItemDropEntry.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/api/drop/ItemDropEntry.kt @@ -52,7 +52,7 @@ class ItemDropEntry : DropEntry { val count = stack.count val succeeded = player.giveItemStack(stack) if (PokemonCobbled.config.announceDropItems) { - player.sendServerMessage( + player.sendMessage( if (succeeded) lang("drop.item.inventory", count, name.copy().green()) else lang("drop.item.full", name).red() ) diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/api/storage/party/PlayerPartyStore.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/api/storage/party/PlayerPartyStore.kt index e6e12b7141..0a08929354 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/api/storage/party/PlayerPartyStore.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/api/storage/party/PlayerPartyStore.kt @@ -43,13 +43,13 @@ open class PlayerPartyStore( if (pc == null || !pc.add(pokemon)) { if (pc == null) { - player?.sendServerMessage(lang("overflow_no_pc")) + player?.sendMessage(lang("overflow_no_pc")) } else { - player?.sendServerMessage(lang("overflow_no_space", pc.name)) + player?.sendMessage(lang("overflow_no_space", pc.name)) } false } else { - player?.sendServerMessage(lang("overflow_to_pc", pokemon.species.translatedName, pc.name)) + player?.sendMessage(lang("overflow_to_pc", pokemon.species.translatedName, pc.name)) true } } diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/battles/BattleBuilder.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/battles/BattleBuilder.kt index e11b719274..24f16cf603 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/battles/BattleBuilder.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/battles/BattleBuilder.kt @@ -211,7 +211,7 @@ open class ErroredBattleStart( } fun sendTo(entity: Entity, transformer: (MutableText) -> (MutableText) = { it }) { - errors.forEach { entity.sendServerMessage(transformer(it.getMessageFor(entity))) } + errors.forEach { entity.sendMessage(transformer(it.getMessageFor(entity))) } } inline fun ifHasError(action: () -> Unit): ErroredBattleStart { diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/net/battle/ChallengeNotificationHandler.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/net/battle/ChallengeNotificationHandler.kt index 27994bac50..584fe1fbc7 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/net/battle/ChallengeNotificationHandler.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/client/net/battle/ChallengeNotificationHandler.kt @@ -11,7 +11,7 @@ import net.minecraft.client.MinecraftClient object ChallengeNotificationHandler : ClientPacketHandler { override fun invokeOnClient(packet: ChallengeNotificationPacket, ctx: CobbledNetwork.NetworkContext) { - MinecraftClient.getInstance().player?.sendServerMessage( + MinecraftClient.getInstance().player?.sendMessage( lang( "challenge.receiver", packet.challengerName, diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/command/CheckSpawnsCommand.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/command/CheckSpawnsCommand.kt index b11129620a..8f14e23240 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/command/CheckSpawnsCommand.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/command/CheckSpawnsCommand.kt @@ -82,19 +82,19 @@ object CheckSpawnsCommand { val messages = mutableListOf() sortedEntries.forEach { (name, percentage) -> val message = name + ": " + applyColour("${df.format(percentage)}%".text(), percentage) -// player.sendServerMessage() +// player.sendMessage() messages.add(message) } if (messages.isEmpty()) { - player.sendServerMessage(lang("command.checkspawns.nothing").red()) + player.sendMessage(lang("command.checkspawns.nothing").red()) } else { - player.sendServerMessage(lang("command.checkspawns.spawns").underline()) + player.sendMessage(lang("command.checkspawns.spawns").underline()) val msg = messages[0] for (nextMessage in messages.subList(1, messages.size)) { msg.add(", ".text() + nextMessage) } - player.sendServerMessage(msg) + player.sendMessage(msg) } return Command.SINGLE_SUCCESS diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/command/GetNBT.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/command/GetNBT.kt index a61a0a33d9..4dcf04e88d 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/command/GetNBT.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/command/GetNBT.kt @@ -24,7 +24,7 @@ object GetNBT { try { val formatter = NbtOrderedStringFormatter("", 0, mutableListOf()) val str = formatter.apply(stack.nbt) - player.sendServerMessage(str.text().suggest(str)) + player.sendMessage(str.text().suggest(str)) } catch (e: Exception) { e.printStackTrace() } diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/entity/pokeball/EmptyPokeBallEntity.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/entity/pokeball/EmptyPokeBallEntity.kt index ec2ae1e1d6..3a795749b8 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/entity/pokeball/EmptyPokeBallEntity.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/entity/pokeball/EmptyPokeBallEntity.kt @@ -125,7 +125,7 @@ class EmptyPokeBallEntity( val owner = owner if (!pokemonEntity.pokemon.isWild()) { - owner?.sendServerMessage(lang("capture.not_wild", pokemonEntity.pokemon.species.translatedName).red()) + owner?.sendMessage(lang("capture.not_wild", pokemonEntity.pokemon.species.translatedName).red()) return drop() } @@ -135,7 +135,7 @@ class EmptyPokeBallEntity( val hitBattlePokemon = hitActor?.activePokemon?.find { it.battlePokemon?.effectedPokemon?.entity == pokemonEntity } if (throwerActor == null) { - owner.sendServerMessage(lang("capture.in_battle", pokemonEntity.pokemon.species.translatedName).red()) + owner.sendMessage(lang("capture.in_battle", pokemonEntity.pokemon.species.translatedName).red()) return drop() } @@ -144,12 +144,12 @@ class EmptyPokeBallEntity( } if (battle.format.battleType != BattleTypes.SINGLES || hitActor.pokemonList.count { it.health > 0 } > 1) { - owner.sendServerMessage(lang("capture.not_single").red()) + owner.sendMessage(lang("capture.not_single").red()) return drop() } val request = throwerActor.request?.takeIf { throwerActor.mustChoose } ?: run { - owner.sendServerMessage(lang("capture.not_your_turn").red()) + owner.sendMessage(lang("capture.not_your_turn").red()) return drop() } @@ -168,14 +168,14 @@ class EmptyPokeBallEntity( battle.sendUpdate(BattleCaptureStartPacket(pokeBall.name, hitBattlePokemon.getPNX())) throwerActor.sendUpdate(BattleApplyCaptureResponsePacket()) } else { - owner.sendServerMessage(lang("capture.not_your_turn").red()) + owner.sendMessage(lang("capture.not_your_turn").red()) return drop() } } else if (pokemonEntity.isBusy) { - owner?.sendServerMessage(lang("capture.busy", pokemonEntity.pokemon.species.translatedName).red()) + owner?.sendMessage(lang("capture.busy", pokemonEntity.pokemon.species.translatedName).red()) return drop() } else if (owner is ServerPlayerEntity && BattleRegistry.getBattleByParticipatingPlayer(owner) != null) { - owner.sendServerMessage(lang("you_in_battle").red()) + owner.sendMessage(lang("you_in_battle").red()) return drop() } capturingPokemon = pokemonEntity diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/ChallengeHandler.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/ChallengeHandler.kt index 072dd5d96f..2bacdd9dad 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/ChallengeHandler.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/ChallengeHandler.kt @@ -41,7 +41,7 @@ object ChallengeHandler : PacketHandler { BattleRegistry.pvpChallenges.remove(player.uuid, challenge) } targetedEntity.sendPacket(ChallengeNotificationPacket(player.name.copy().aqua())) - player.sendServerMessage(lang("challenge.sender", targetedEntity.name).yellow()) + player.sendMessage(lang("challenge.sender", targetedEntity.name).yellow()) } } else -> { diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/battle/BattleSelectActionsHandler.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/battle/BattleSelectActionsHandler.kt index fa598efea0..49da1145e5 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/battle/BattleSelectActionsHandler.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/battle/BattleSelectActionsHandler.kt @@ -24,7 +24,7 @@ object BattleSelectActionsHandler : PacketHandler { try { actor.setActionResponses(packet.showdownActionResponses) } catch (e: IllegalActionChoiceException) { - player.sendServerMessage(e.message!!.red()) + player.sendMessage(e.message!!.red()) actor.sendUpdate(BattleQueueRequestPacket(actor.request!!)) actor.sendUpdate(BattleMakeChoicePacket()) } diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/starter/RequestStarterScreenHandler.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/starter/RequestStarterScreenHandler.kt index 6db24ef1d2..2ea2c8ad85 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/starter/RequestStarterScreenHandler.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/net/serverhandling/starter/RequestStarterScreenHandler.kt @@ -13,9 +13,9 @@ object RequestStarterScreenHandler : ServerPacketHandler incrementFriendship(5) 2 -> incrementFriendship(4) 3 -> incrementFriendship(3) } result.newMoves.forEach { - player.sendServerMessage(lang("experience.learned_move", species.translatedName, it.displayName)) + player.sendMessage(lang("experience.learned_move", species.translatedName, it.displayName)) } } } diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/starter/CobbledStarterHandler.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/starter/CobbledStarterHandler.kt index a5891556f7..c1e01471a7 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/starter/CobbledStarterHandler.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/starter/CobbledStarterHandler.kt @@ -19,9 +19,9 @@ open class CobbledStarterHandler : StarterHandler { val playerData = PokemonCobbled.playerData.get(player) if (playerData.starterSelected) { playerData.sendToPlayer(player) - player.sendServerMessage(lang("ui.starter.alreadyselected").red()) + player.sendMessage(lang("ui.starter.alreadyselected").red()) } else if (playerData.starterLocked) { - player.sendServerMessage(lang("ui.starter.cannotchoose").red()) + player.sendMessage(lang("ui.starter.cannotchoose").red()) } else { OpenStarterUIPacket(getStarterList(player)).sendToPlayer(player) playerData.starterPrompted = true @@ -32,9 +32,9 @@ open class CobbledStarterHandler : StarterHandler { override fun chooseStarter(player: ServerPlayerEntity, categoryName: String, index: Int) { val playerData = PokemonCobbled.playerData.get(player) if (playerData.starterSelected) { - return player.sendServerMessage(lang("ui.starter.alreadyselected").red()) + return player.sendMessage(lang("ui.starter.alreadyselected").red()) } else if (playerData.starterLocked) { - return player.sendServerMessage(lang("ui.starter.cannotchoose").red()) + return player.sendMessage(lang("ui.starter.cannotchoose").red()) } val category = getStarterList(player).find { it.name == categoryName } ?: return diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/util/PlayerExtensions.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/util/PlayerExtensions.kt index b68d959397..4b9a9f0ae1 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/util/PlayerExtensions.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/util/PlayerExtensions.kt @@ -21,11 +21,6 @@ import net.minecraft.util.math.Vec3d fun ServerPlayerEntity.party() = PokemonCobbled.storage.getParty(this) fun UUID.getPlayer() = getServer()?.playerManager?.getPlayer(this) -// TODO: Mass replace in a little bit -fun Entity.sendServerMessage(component: Text) { - sendMessage(component) -} - fun ServerPlayerEntity.onLogout(handler: () -> Unit) { CobbledEvents.PLAYER_QUIT.pipe(filter { it.uuid == uuid }, takeFirst()).subscribe { handler() } } @@ -33,7 +28,7 @@ fun ServerPlayerEntity.onLogout(handler: () -> Unit) { // Player extension for queueing next logout or login fun Entity.sendTranslatedServerMessage(str: String) { - sendServerMessage(str.asTranslated()) + sendMessage(str.asTranslated()) } class TraceResult( diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/world/level/block/HealingMachineBlock.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/world/level/block/HealingMachineBlock.kt index 5f4ef4c41c..a504dc4e95 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/world/level/block/HealingMachineBlock.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/world/level/block/HealingMachineBlock.kt @@ -87,28 +87,28 @@ class HealingMachineBlock(properties: Settings) : BlockWithEntity(properties) { } if (blockEntity.isInUse) { - player.sendServerMessage(lang("healingmachine.alreadyinuse").red()) + player.sendMessage(lang("healingmachine.alreadyinuse").red()) return ActionResult.SUCCESS } val serverPlayerEntity = player as ServerPlayerEntity val party = serverPlayerEntity.party() if (party.none()) { - player.sendServerMessage(lang("healingmachine.nopokemon").red()) + player.sendMessage(lang("healingmachine.nopokemon").red()) return ActionResult.SUCCESS } if (party.getHealingRemainderPercent() == 0.0f) { - player.sendServerMessage(lang("healingmachine.alreadyhealed").red()) + player.sendMessage(lang("healingmachine.alreadyhealed").red()) return ActionResult.SUCCESS } if (blockEntity.canHeal(player)) { blockEntity.activate(player) - player.sendServerMessage(lang("healingmachine.healing").green()) + player.sendMessage(lang("healingmachine.healing").green()) } else { val neededCharge = player.party().getHealingRemainderPercent() - blockEntity.healingCharge - player.sendServerMessage(lang("healingmachine.notenoughcharge", "${((neededCharge/party.count())*100f).toInt()}%").red()) + player.sendMessage(lang("healingmachine.notenoughcharge", "${((neededCharge/party.count())*100f).toInt()}%").red()) } return ActionResult.CONSUME } diff --git a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/world/level/block/entity/HealingMachineBlockEntity.kt b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/world/level/block/entity/HealingMachineBlockEntity.kt index 8bbec4db09..20b1514025 100644 --- a/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/world/level/block/entity/HealingMachineBlockEntity.kt +++ b/common/src/main/kotlin/com/cablemc/pokemoncobbled/common/world/level/block/entity/HealingMachineBlockEntity.kt @@ -65,7 +65,7 @@ class HealingMachineBlockEntity( val party = player.party() party.heal() - player.sendServerMessage(lang("healingmachine.healed").green()) + player.sendMessage(lang("healingmachine.healed").green()) this.clearData() }