From bcafacd5ca8abe390ebaedf592a087eda1a82e7c Mon Sep 17 00:00:00 2001 From: Jo_field <150937665+JoField08@users.noreply.github.com> Date: Wed, 25 Mar 2026 22:16:03 +0100 Subject: [PATCH] fix: updated prefixes --- .../transaction/core/component/Components.kt | 51 ++++++++++++++++--- .../subcommands/AccountCreateCommand.kt | 1 - .../subcommands/AccountDeleteCommand.kt | 1 - .../member/AddAccountMemberCommand.kt | 1 - .../member/RemoveAccountMemberCommand.kt | 1 - .../subcommands/CurrencyCreateCommand.kt | 1 - .../subcommands/CurrencyMakeDefaultCommand.kt | 1 - .../paper/commands/pay/PayCommand.kt | 2 +- .../subcommands/TransactionAddCommand.kt | 4 +- .../subcommands/TransactionRemoveCommand.kt | 4 +- .../paper/pay/PaymentEventsHandler.kt | 2 +- .../transaction/TransactionEventsHandler.kt | 2 +- 12 files changed, 51 insertions(+), 20 deletions(-) diff --git a/surf-transaction-core/src/main/kotlin/dev/slne/surf/transaction/core/component/Components.kt b/surf-transaction-core/src/main/kotlin/dev/slne/surf/transaction/core/component/Components.kt index 8803be6..93040a8 100644 --- a/surf-transaction-core/src/main/kotlin/dev/slne/surf/transaction/core/component/Components.kt +++ b/surf-transaction-core/src/main/kotlin/dev/slne/surf/transaction/core/component/Components.kt @@ -41,6 +41,7 @@ object Components { suspend fun formatCreationResult(result: AccountCreationResult) = buildText { when (result) { is AccountCreationResult.Success -> { + appendSuccessPrefix() success("Das Konto ") append(displayName(result.account as AccountImpl)) success(" wurde erfolgreich erstellt") @@ -48,10 +49,25 @@ object Components { is AccountCreationResult.Failed -> { when (result.reason) { - NAME_ALREADY_EXISTS -> error("Ein Konto mit diesem Namen existiert bereits") - NAME_TOO_LONG -> error("Der Name darf maximal ${ApiAccount.MAX_NAME_LENGTH} Zeichen lang sein") - NAME_TOO_SHORT -> error("Der Name muss mindestens ${ApiAccount.MIN_NAME_LENGTH} Zeichen lang sein") - NAME_IS_UUID -> error("Der Name darf keine UUID sein") + NAME_ALREADY_EXISTS -> { + appendErrorPrefix() + error("Ein Konto mit diesem Namen existiert bereits") + } + + NAME_TOO_LONG -> { + appendErrorPrefix() + error("Der Name darf maximal ${ApiAccount.MAX_NAME_LENGTH} Zeichen lang sein") + } + + NAME_TOO_SHORT -> { + appendErrorPrefix() + error("Der Name muss mindestens ${ApiAccount.MIN_NAME_LENGTH} Zeichen lang sein") + } + + NAME_IS_UUID -> { + appendErrorPrefix() + error("Der Name darf keine UUID sein") + } } } } @@ -59,9 +75,21 @@ object Components { fun formatDeletionResult(result: AccountDeleteResult) = buildText { when (result) { - AccountDeleteResult.SUCCESS -> success("Das Konto wurde erfolgreich gelöscht") - AccountDeleteResult.DEFAULT_ACCOUNT_CANNOT_BE_DELETED -> error("Das Standardkonto kann nicht gelöscht werden") - AccountDeleteResult.ACCOUNT_NOT_FOUND -> error("Das Konto konnte nicht gefunden werden") + AccountDeleteResult.SUCCESS -> { + appendSuccessPrefix() + success("Das Konto wurde erfolgreich gelöscht") + } + + AccountDeleteResult.DEFAULT_ACCOUNT_CANNOT_BE_DELETED -> { + appendErrorPrefix() + error("Das Standardkonto kann nicht gelöscht werden") + } + + AccountDeleteResult.ACCOUNT_NOT_FOUND -> { + appendErrorPrefix() + + error("Das Konto konnte nicht gefunden werden") + } } } @@ -70,6 +98,7 @@ object Components { buildText { when (result) { AccountMemberResult.SUCCESS -> { + appendSuccessPrefix() variableValue(usernameOrUuid(member)) success(" wurde erfolgreich als Mitglied ") if (added) { @@ -80,6 +109,7 @@ object Components { } AccountMemberResult.NOTHING_CHANGED -> { + appendErrorPrefix() if (added) { variableValue(usernameOrUuid(member)) error(" ist bereits ein Mitglied des Kontos") @@ -99,28 +129,33 @@ object Components { fun formatCreateResult(currency: CurrencyImpl, result: CurrencyCreateResult) = buildText { when (result) { CurrencyCreateResult.SUCCESS -> { + appendSuccessPrefix() success("Die Währung ") append(currency) success(" wurde erfolgreich erstellt") } CurrencyCreateResult.ALREADY_EXISTS -> { + appendErrorPrefix() error("Die Währung ") append(currency) error(" existiert bereits!") } CurrencyCreateResult.DEFAULT_ALREADY_EXISTS -> { + appendErrorPrefix() error("Es existiert bereits eine Standardwährung!") } CurrencyCreateResult.INVALID_NAME -> { + appendErrorPrefix() error("Der Name '") variableValue(currency.name) error("' ist ungültig!") } CurrencyCreateResult.INVALID_SYMBOL -> { + appendErrorPrefix() error("Das Symbol '") variableValue(currency.symbol) error("' ist ungültig!") @@ -134,11 +169,13 @@ object Components { ) = buildText { when (result) { CurrencyDefaultResult.SUCCESS -> { + appendSuccessPrefix() append(currency) success(" ist nun die Standardwährung") } CurrencyDefaultResult.NOT_FOUND -> { + appendErrorPrefix() error("Die Währung ") append(currency) error(" wurde nicht gefunden") diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/AccountCreateCommand.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/AccountCreateCommand.kt index d6233f4..b81a8b3 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/AccountCreateCommand.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/AccountCreateCommand.kt @@ -20,7 +20,6 @@ fun CommandAPICommand.accountCreateCommand() = subcommand("create") { val result = player.transactionUser().createAccount(name) player.sendText { - appendPrefix() append(Components.Account.formatCreationResult(result)) } } diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/AccountDeleteCommand.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/AccountDeleteCommand.kt index 3a5649e..bcd5a20 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/AccountDeleteCommand.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/AccountDeleteCommand.kt @@ -21,7 +21,6 @@ fun CommandAPICommand.accountDeleteCommand() = subcommand("delete") { val result = player.transactionUser().deleteAccount(account) player.sendText { - appendPrefix() append(Components.Account.formatDeletionResult(result)) } } diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/member/AddAccountMemberCommand.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/member/AddAccountMemberCommand.kt index 6576542..2ae533b 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/member/AddAccountMemberCommand.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/member/AddAccountMemberCommand.kt @@ -36,7 +36,6 @@ fun CommandAPICommand.addAccountMemberCommand() = subcommand("add") { ) sender.sendText { - appendPrefix() append(Components.Account.Member.formatResult(result, targetUuid, added = true)) } } diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/member/RemoveAccountMemberCommand.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/member/RemoveAccountMemberCommand.kt index 8b201e1..fb486dc 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/member/RemoveAccountMemberCommand.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/account/subcommands/member/RemoveAccountMemberCommand.kt @@ -26,7 +26,6 @@ fun CommandAPICommand.removeAccountMemberCommand() = subcommand("remove") { val result = account.removeMember(sender.uniqueId, targetUuid) sender.sendText { - appendPrefix() append(Components.Account.Member.formatResult(result, targetUuid, added = false)) } } diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/currency/admin/subcommands/CurrencyCreateCommand.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/currency/admin/subcommands/CurrencyCreateCommand.kt index 41d87c4..2a0665f 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/currency/admin/subcommands/CurrencyCreateCommand.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/currency/admin/subcommands/CurrencyCreateCommand.kt @@ -80,7 +80,6 @@ private suspend fun create( val result = CurrencyServiceImpl.get().createCurrency(currency) sender.sendText { - appendPrefix() append(Components.Currency.formatCreateResult(currency, result)) } } \ No newline at end of file diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/currency/admin/subcommands/CurrencyMakeDefaultCommand.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/currency/admin/subcommands/CurrencyMakeDefaultCommand.kt index d372b0d..f47e769 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/currency/admin/subcommands/CurrencyMakeDefaultCommand.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/currency/admin/subcommands/CurrencyMakeDefaultCommand.kt @@ -31,7 +31,6 @@ private suspend fun makeDefault(sender: CommandSender, currency: Currency) { val result = CurrencyServiceImpl.get().makeDefaultCurrency(currency as CurrencyImpl) sender.sendText { - appendPrefix() append(Components.Currency.formatChangedDefaultResult(currency, result)) } } \ No newline at end of file diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/pay/PayCommand.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/pay/PayCommand.kt index efa61b7..18d094f 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/pay/PayCommand.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/pay/PayCommand.kt @@ -51,7 +51,7 @@ private suspend fun pay( } sender.sendText { - appendPrefix() + appendInfoPrefix() info("Überweisung wird ausgeführt...") } diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/transaction/admin/subcommands/TransactionAddCommand.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/transaction/admin/subcommands/TransactionAddCommand.kt index 255f4cf..2d76748 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/transaction/admin/subcommands/TransactionAddCommand.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/transaction/admin/subcommands/TransactionAddCommand.kt @@ -71,7 +71,7 @@ private suspend fun add( private fun handleError(sender: CommandSender, result: TransactionResult, receiverUuid: UUID) { sender.sendText { - appendPrefix() + appendErrorPrefix() error("Es ist ein Fehler aufgetreten!") } @@ -87,7 +87,7 @@ private suspend fun handleSuccess( currency: Currency ) { sender.sendText { - appendPrefix() + appendSuccessPrefix() darkSpacer("[") variableKey("Admin") diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/transaction/admin/subcommands/TransactionRemoveCommand.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/transaction/admin/subcommands/TransactionRemoveCommand.kt index e96502b..9c415e9 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/transaction/admin/subcommands/TransactionRemoveCommand.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/commands/transaction/admin/subcommands/TransactionRemoveCommand.kt @@ -72,7 +72,7 @@ private suspend fun remove( private fun handleError(sender: CommandSender, result: TransactionResult, receiverUuid: UUID) { sender.sendText { - appendPrefix() + appendErrorPrefix() error("Es ist ein Fehler aufgetreten!") } @@ -88,7 +88,7 @@ private suspend fun handleSuccess( currency: Currency ) { sender.sendText { - appendPrefix() + appendSuccessPrefix() darkSpacer("[") variableKey("Admin") diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/pay/PaymentEventsHandler.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/pay/PaymentEventsHandler.kt index fae6055..3c151c4 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/pay/PaymentEventsHandler.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/pay/PaymentEventsHandler.kt @@ -19,7 +19,7 @@ class PaymentEventsHandler { plugin.launch(plugin.entityDispatcher(receiver)) { receiver.sendText { - appendPrefix() + appendInfoPrefix() info("Du hast ") append(event.currency.format(event.amount)) diff --git a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/transaction/TransactionEventsHandler.kt b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/transaction/TransactionEventsHandler.kt index 5ae6055..4350a63 100644 --- a/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/transaction/TransactionEventsHandler.kt +++ b/surf-transaction-paper/src/main/kotlin/dev/slne/surf/transaction/paper/transaction/TransactionEventsHandler.kt @@ -19,7 +19,7 @@ class TransactionEventsHandler { plugin.launch(plugin.entityDispatcher(receiver)) { receiver.sendText { - appendPrefix() + appendInfoPrefix() darkSpacer("[") variableKey("Admin")