Remove sendServerMessage extension

This commit is contained in:
Deltric committed 2022-08-15 08:56:14 -05:00
1 parent 15d790fdd5
commit 159a3b88ca
15 files changed
+36 -41

No files matched your search

@@ -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()
)
@@ -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
}
}
@@ -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 <reified T : BattleStartError> ifHasError(action: () -> Unit): ErroredBattleStart {
@@ -11,7 +11,7 @@ import net.minecraft.client.MinecraftClient
object ChallengeNotificationHandler : ClientPacketHandler<ChallengeNotificationPacket> {
override fun invokeOnClient(packet: ChallengeNotificationPacket, ctx: CobbledNetwork.NetworkContext) {
MinecraftClient.getInstance().player?.sendServerMessage(
MinecraftClient.getInstance().player?.sendMessage(
lang(
"challenge.receiver",
packet.challengerName,
@@ -82,19 +82,19 @@ object CheckSpawnsCommand {
val messages = mutableListOf<MutableText>()
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
@@ -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()
}
@@ -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
@@ -41,7 +41,7 @@ object ChallengeHandler : PacketHandler<BattleChallengePacket> {
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 -> {
@@ -24,7 +24,7 @@ object BattleSelectActionsHandler : PacketHandler<BattleSelectActionsPacket> {
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())
}
@@ -13,9 +13,9 @@ object RequestStarterScreenHandler : ServerPacketHandler<RequestStarterScreenPac
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())
} else {
PokemonCobbled.starterHandler.requestStarterChoice(player)
}
@@ -760,17 +760,17 @@ open class Pokemon {
}
fun addExperienceWithPlayer(player: ServerPlayerEntity, source: ExperienceSource, xp: Int) {
player.sendServerMessage(lang("experience.gained", species.translatedName, xp))
player.sendMessage(lang("experience.gained", species.translatedName, xp))
val result = addExperience(source, xp)
if (result.oldLevel != result.newLevel) {
player.sendServerMessage(lang("experience.level_up", species.translatedName, result.newLevel))
player.sendMessage(lang("experience.level_up", species.translatedName, result.newLevel))
when(getFriendshipSpan()){
1 -> 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))
}
}
}
@@ -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
@@ -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(
@@ -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
}
@@ -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()
}