From 03a8eb9b7d04d28526e0af2c511ef8c1221150ce Mon Sep 17 00:00:00 2001 From: ineanto Date: Sat, 28 Jun 2025 20:21:19 +0200 Subject: [PATCH] fix: return ok instead of error dumbass --- .../xyz/ineanto/nicko/appearance/AppearanceManager.java | 2 +- .../java/xyz/ineanto/nicko/gui/items/home/ResetItem.java | 6 ++++-- src/main/resources/fr.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java b/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java index 394169f..f754a29 100644 --- a/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java +++ b/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java @@ -37,7 +37,7 @@ public class AppearanceManager { profile.setSkin(null); dataStore.getCache().cache(player.getUniqueId(), profile); - return ActionResult.error(); + return ActionResult.ok(); } public ActionResult update(boolean skinChange) { diff --git a/src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java index c3f1b68..06443b4 100644 --- a/src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java @@ -4,6 +4,7 @@ import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; +import xyz.ineanto.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.AppearanceManager; import xyz.ineanto.nicko.language.PlayerLanguage; import xyz.ineanto.nicko.language.LanguageKey; @@ -37,10 +38,11 @@ public class ResetItem { } final AppearanceManager appearanceManager = new AppearanceManager(player); - if (!appearanceManager.reset().isError()) { + final ActionResult reset = appearanceManager.reset(); + if (!reset.isError()) { player.sendMessage(playerLanguage.translateWithWhoosh(LanguageKey.Event.Appearance.Remove.OK)); } else { - player.sendMessage(playerLanguage.translateWithOops(LanguageKey.Event.Appearance.Remove.ERROR)); + player.sendMessage(playerLanguage.translateWithOops(LanguageKey.Event.Appearance.Remove.ERROR, reset.getErrorKey())); player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1, 1f); } }); diff --git a/src/main/resources/fr.yml b/src/main/resources/fr.yml index 109a887..02c7310 100644 --- a/src/main/resources/fr.yml +++ b/src/main/resources/fr.yml @@ -26,7 +26,7 @@ event: error: "Impossible d''appliquer le précédent déguisement ! ({0})" ok: "Votre précédent déguisement a été appliqué." remove: - error: "Impossible de retirer votre déguisement." + error: "Impossible de retirer votre déguisement ({0})." missing: "Vous n''avez pas de déguisement." ok: "Déguisement retiré." admin: