From f2e0f6e2d50b1d79d8f3658913606a79280190b9 Mon Sep 17 00:00:00 2001 From: simoleo89 Date: Thu, 4 Jun 2026 21:09:08 +0200 Subject: [PATCH] feat(items): source server-pronounced furni names from furnidata (6 sites) --- .../java/com/eu/habbo/habbohotel/catalog/CatalogManager.java | 4 ++-- .../habbo/habbohotel/wired/core/WiredTextPlaceholderUtil.java | 2 +- .../messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java | 4 ++-- .../messages/outgoing/unknown/WatchAndEarnRewardComposer.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java index f0dbccec..3261a132 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java @@ -1054,13 +1054,13 @@ public class CatalogManager { if (Emulator.getConfig().getBoolean("hotel.catalog.ltd.limit.enabled")) { int ltdLimit = Emulator.getConfig().getInt("hotel.purchase.ltd.limit.daily.total"); if (habbo.getHabboStats().totalLtds() >= ltdLimit) { - habbo.alert(Emulator.getTexts().getValue("error.catalog.buy.limited.daily.total").replace("%itemname%", item.getBaseItems().iterator().next().getFullName()).replace("%limit%", ltdLimit + "")); + habbo.alert(Emulator.getTexts().getValue("error.catalog.buy.limited.daily.total").replace("%itemname%", item.getBaseItems().iterator().next().getDisplayName()).replace("%limit%", ltdLimit + "")); return; } ltdLimit = Emulator.getConfig().getInt("hotel.purchase.ltd.limit.daily.item"); if (habbo.getHabboStats().totalLtds(item.id) >= ltdLimit) { - habbo.alert(Emulator.getTexts().getValue("error.catalog.buy.limited.daily.item").replace("%itemname%", item.getBaseItems().iterator().next().getFullName()).replace("%limit%", ltdLimit + "")); + habbo.alert(Emulator.getTexts().getValue("error.catalog.buy.limited.daily.item").replace("%itemname%", item.getBaseItems().iterator().next().getDisplayName()).replace("%limit%", ltdLimit + "")); return; } } diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/core/WiredTextPlaceholderUtil.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/core/WiredTextPlaceholderUtil.java index 4b901e29..32d85ab7 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/core/WiredTextPlaceholderUtil.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/core/WiredTextPlaceholderUtil.java @@ -279,7 +279,7 @@ public final class WiredTextPlaceholderUtil { continue; } - String furniName = item.getBaseItem().getFullName(); + String furniName = item.getBaseItem().getDisplayName(); if (furniName == null || furniName.trim().isEmpty()) { furniName = item.getBaseItem().getName(); } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java index 992ef724..92d941aa 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java @@ -248,7 +248,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { LOGGER.debug("sender reached daily total LTD limit"); this.client.getHabbo().alert( Emulator.getTexts().getValue("error.catalog.buy.limited.daily.total") - .replace("%itemname%", item.getBaseItems().iterator().next().getFullName()) + .replace("%itemname%", item.getBaseItems().iterator().next().getDisplayName()) .replace("%limit%", ltdLimit + "") ); return; @@ -259,7 +259,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { LOGGER.debug("sender reached daily LTD item limit"); this.client.getHabbo().alert( Emulator.getTexts().getValue("error.catalog.buy.limited.daily.item") - .replace("%itemname%", item.getBaseItems().iterator().next().getFullName()) + .replace("%itemname%", item.getBaseItems().iterator().next().getDisplayName()) .replace("%limit%", ltdLimit + "") ); return; diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java index 1fb1e74a..70af9496 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java @@ -18,7 +18,7 @@ public class WatchAndEarnRewardComposer extends MessageComposer { this.response.appendString(this.item.getType().code); this.response.appendInt(this.item.getId()); this.response.appendString(this.item.getName()); - this.response.appendString(this.item.getFullName()); + this.response.appendString(this.item.getDisplayName()); return this.response; }