Skip to content

Commit 9f4a2ba

Browse files
Ghost-chuGhost-chu
committed
Migrate all messages to Translatable Component
1 parent e214d39 commit 9f4a2ba

File tree

10 files changed

+36
-27
lines changed

10 files changed

+36
-27
lines changed

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Buy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.maxgamer.quickshop.api.command.CommandHandler;
2929
import org.maxgamer.quickshop.api.shop.Shop;
3030
import org.maxgamer.quickshop.api.shop.ShopType;
31-
import org.maxgamer.quickshop.util.Util;
31+
import org.maxgamer.quickshop.util.MsgUtil;
3232

3333
@AllArgsConstructor
3434
public class SubCommand_Buy implements CommandHandler<Player> {
@@ -48,7 +48,7 @@ public void onCommand(@NotNull Player sender
4848
if (shop.getModerator().isModerator(sender.getUniqueId()) || QuickShop.getPermissionManager().hasPermission(sender, "quickshop.other.control")) {
4949
shop.setShopType(ShopType.BUYING);
5050
shop.update();
51-
plugin.text().of(sender, "command.now-buying", Util.getItemStackName(shop.getItem())).send();
51+
plugin.text().of(sender, "command.now-buying", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
5252
} else {
5353
plugin.text().of(sender, "not-managed-shop").send();
5454
}

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Item.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.maxgamer.quickshop.api.shop.PriceLimiterStatus;
3333
import org.maxgamer.quickshop.api.shop.Shop;
3434
import org.maxgamer.quickshop.shop.JavaPriceLimiter;
35+
import org.maxgamer.quickshop.util.MsgUtil;
3536
import org.maxgamer.quickshop.util.Util;
3637

3738
@AllArgsConstructor
@@ -70,7 +71,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
7071
plugin.getConfiguration().getBoolean("whole-number-prices-only"));
7172
PriceLimiterCheckResult checkResult = limiter.check(itemStack, shop.getPrice());
7273
if (checkResult.getStatus() != PriceLimiterStatus.PASS) {
73-
plugin.text().of(sender, "restricted-prices", Util.getItemStackName(shop.getItem()),
74+
plugin.text().of(sender, "restricted-prices", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
7475
String.valueOf(checkResult.getMin()),
7576
String.valueOf(checkResult.getMax())).send();
7677
return;

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Price.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
116116
return;
117117
}
118118
if (checkResult.getStatus() == PriceLimiterStatus.PRICE_RESTRICTED) {
119-
plugin.text().of(sender, "restricted-prices", Util.getItemStackName(shop.getItem()),
119+
plugin.text().of(sender, "restricted-prices", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
120120
String.valueOf(checkResult.getMin()),
121121
String.valueOf(checkResult.getMax())).send();
122122
return;

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Sell.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.maxgamer.quickshop.api.command.CommandHandler;
2929
import org.maxgamer.quickshop.api.shop.Shop;
3030
import org.maxgamer.quickshop.api.shop.ShopType;
31-
import org.maxgamer.quickshop.util.Util;
31+
import org.maxgamer.quickshop.util.MsgUtil;
3232

3333
@AllArgsConstructor
3434
public class SubCommand_Sell implements CommandHandler<Player> {
@@ -47,7 +47,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
4747
if (shop.getModerator().isModerator(sender.getUniqueId()) || QuickShop.getPermissionManager().hasPermission(sender, "quickshop.other.control")) {
4848
shop.setShopType(ShopType.SELLING);
4949
shop.update();
50-
plugin.text().of(sender, "command.now-selling", Util.getItemStackName(shop.getItem())).send();
50+
plugin.text().of(sender, "command.now-selling", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
5151
} else {
5252
plugin.text().of(sender, "not-managed-shop").send();
5353
}

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SilentSell.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
5454
shop.update();
5555
MsgUtil.sendControlPanelInfo(sender, shop);
5656
plugin.text().of(sender,
57-
"command.now-selling", Util.getItemStackName(shop.getItem())).send();
57+
"command.now-selling", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
5858
}
5959
}

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Size.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.maxgamer.quickshop.api.shop.PriceLimiterStatus;
3333
import org.maxgamer.quickshop.api.shop.Shop;
3434
import org.maxgamer.quickshop.shop.JavaPriceLimiter;
35+
import org.maxgamer.quickshop.util.MsgUtil;
3536
import org.maxgamer.quickshop.util.Util;
3637

3738
import java.util.Collections;
@@ -74,13 +75,13 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
7475
plugin.getConfiguration().getBoolean("whole-number-prices-only"));
7576
PriceLimiterCheckResult checkResult = limiter.check(pendingItemStack, shop.getPrice());
7677
if (checkResult.getStatus() != PriceLimiterStatus.PASS) {
77-
plugin.text().of(sender, "restricted-prices", Util.getItemStackName(shop.getItem()),
78+
plugin.text().of(sender, "restricted-prices", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
7879
String.valueOf(checkResult.getMin()),
7980
String.valueOf(checkResult.getMax())).send();
8081
return;
8182
}
8283
shop.setItem(pendingItemStack);
83-
plugin.text().of(sender, "command.bulk-size-now", Integer.toString(shop.getItem().getAmount()), Util.getItemStackName(shop.getItem())).send();
84+
plugin.text().of(sender, "command.bulk-size-now", Integer.toString(shop.getItem().getAmount()), MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
8485
return;
8586
} else {
8687
plugin.text().of(sender, "not-managed-shop").send();

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SuperCreate.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.maxgamer.quickshop.api.command.CommandHandler;
3131
import org.maxgamer.quickshop.api.shop.ShopAction;
3232
import org.maxgamer.quickshop.shop.JavaInfo;
33+
import org.maxgamer.quickshop.util.MsgUtil;
3334
import org.maxgamer.quickshop.util.Util;
3435

3536
import java.util.Collections;
@@ -65,7 +66,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
6566
final JavaInfo info = new JavaInfo(b.getLocation(), ShopAction.CREATE, sender.getInventory().getItemInMainHand(), b.getRelative(sender.getFacing().getOppositeFace()));
6667

6768
plugin.getShopManager().getActions().put(sender.getUniqueId(), info);
68-
plugin.text().of(sender, "how-much-to-trade-for", Util.getItemStackName(item), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(sender, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
69+
plugin.text().of(sender, "how-much-to-trade-for", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(sender, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
6970
return;
7071
}
7172
plugin.text().of(sender, "not-looking-at-shop").send();

‎src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ else if (e.useInteractedBlock() == Event.Result.ALLOW
290290
final JavaInfo info = new JavaInfo(b.getLocation(), ShopAction.CREATE, e.getItem(), last);
291291

292292
plugin.getShopManager().getActions().put(p.getUniqueId(), info);
293-
plugin.text().of(p, "how-much-to-trade-for", Util.getItemStackName(Objects.requireNonNull(e.getItem())), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(p, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
293+
plugin.text().of(p, "how-much-to-trade-for", MsgUtil.convertItemStackToTranslateText(Objects.requireNonNull(e.getItem()).getType()), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(p, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
294294
}
295295
}
296296

‎src/main/java/org/maxgamer/quickshop/shop/JavaShopManager.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ public void actionBuy(
706706
space = 10000;
707707
}
708708
if (space < amount) {
709-
plugin.text().of(buyer, "shop-has-no-space", Integer.toString(space), Util.getItemStackName(shop.getItem())).send();
709+
plugin.text().of(buyer, "shop-has-no-space", Integer.toString(space), MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
710710
return;
711711
}
712712
int count = Util.countItems(buyerInventory, shop.getItem());
@@ -715,7 +715,7 @@ public void actionBuy(
715715
plugin.text().of(buyer,
716716
"you-dont-have-that-many-items",
717717
Integer.toString(count),
718-
Util.getItemStackName(shop.getItem())).send();
718+
MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
719719
return;
720720
}
721721
if (amount < 1) {
@@ -776,7 +776,7 @@ public void actionBuy(
776776
String msg = plugin.text().of(buyer, "player-sold-to-your-store",
777777
player != null ? player.getName() : buyer.toString(),
778778
String.valueOf(amount),
779-
Util.getItemStackName(shop.getItem())).forLocale();
779+
MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).forLocale();
780780

781781
if (space == amount) {
782782
msg += "\n" + plugin.text().of(buyer, "shop-out-of-space",
@@ -949,7 +949,7 @@ public void actionCreate(@NotNull Player p, Info info, @NotNull String message,
949949
return;
950950
case PRICE_RESTRICTED:
951951
plugin.text().of(p, "restricted-prices",
952-
Util.getItemStackName(info.getItem()),
952+
MsgUtil.convertItemStackToTranslateText(info.getItem().getType()),
953953
String.valueOf(priceCheckResult.getMin()),
954954
String.valueOf(priceCheckResult.getMax())).send();
955955
return;
@@ -1077,7 +1077,7 @@ public void actionSell(
10771077
}
10781078
if (stock < amount) {
10791079
plugin.text().of(seller, "shop-stock-too-low", Integer.toString(stock),
1080-
Util.getItemStackName(shop.getItem())).send();
1080+
MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
10811081
return;
10821082
}
10831083
if (amount < 1) {
@@ -1148,14 +1148,14 @@ public void actionSell(
11481148
msg = plugin.text().of(seller, "player-bought-from-your-store-tax",
11491149
player != null ? player.getName() : seller.toString(),
11501150
Integer.toString(amount * shop.getItem().getAmount()),
1151-
Util.getItemStackName(shop.getItem()),
1151+
MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
11521152
Double.toString(total),
11531153
this.formatter.format(CalculateUtil.multiply(taxModifier, total), shop)).forLocale();
11541154
} else {
11551155
msg = plugin.text().of(seller, "player-bought-from-your-store",
11561156
player != null ? player.getName() : seller.toString(),
11571157
Integer.toString(amount * shop.getItem().getAmount()),
1158-
Util.getItemStackName(shop.getItem()),
1158+
MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
11591159
Double.toString(total)).forLocale();
11601160
}
11611161
// Transfers the item from A to B
@@ -1164,7 +1164,7 @@ public void actionSell(
11641164
Integer.toString(shop.getLocation().getBlockX()),
11651165
Integer.toString(shop.getLocation().getBlockY()),
11661166
Integer.toString(shop.getLocation().getBlockZ()),
1167-
Util.getItemStackName(shop.getItem())).forLocale();
1167+
MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).forLocale();
11681168
}
11691169

11701170
MsgUtil.TransactionMessage transactionMessage = new MsgUtil.TransactionMessage(msg, Util.serialize(shop.getItem()), null);
@@ -1197,7 +1197,7 @@ public void sendPurchaseSuccess(@NotNull UUID purchaser, @NotNull Shop shop, int
11971197
ChatSheetPrinter chatSheetPrinter = new ChatSheetPrinter(sender);
11981198
chatSheetPrinter.printHeader();
11991199
chatSheetPrinter.printLine(plugin.text().of(sender, "menu.successful-purchase").forLocale());
1200-
chatSheetPrinter.printLine(plugin.text().of(sender, "menu.item-name-and-price", Integer.toString(amount * shop.getItem().getAmount()), Util.getItemStackName(shop.getItem()), format(amount * shop.getPrice(), shop)).forLocale());
1200+
chatSheetPrinter.printLine(plugin.text().of(sender, "menu.item-name-and-price", Integer.toString(amount * shop.getItem().getAmount()), MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()), format(amount * shop.getPrice(), shop)).forLocale());
12011201
MsgUtil.printEnchantment(sender, shop, chatSheetPrinter);
12021202
chatSheetPrinter.printFooter();
12031203
}
@@ -1222,7 +1222,7 @@ public void sendSellSuccess(@NotNull UUID seller, @NotNull Shop shop, int amount
12221222
plugin.text().of(sender,
12231223
"menu.item-name-and-price",
12241224
Integer.toString(amount),
1225-
Util.getItemStackName(shop.getItem()),
1225+
MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
12261226
format(amount * shop.getPrice(), shop)).forLocale());
12271227
if (plugin.getConfiguration().getBoolean("show-tax")) {
12281228
double tax = plugin.getConfiguration().getDouble("tax");
@@ -1255,7 +1255,7 @@ public void sendShopInfo(@NotNull Player p, @NotNull Shop shop) {
12551255
chatSheetPrinter.printLine(plugin.text().of(p, "menu.shop-information").forLocale());
12561256
chatSheetPrinter.printLine(plugin.text().of(p, "menu.owner", shop.ownerName()).forLocale());
12571257
// Enabled
1258-
plugin.getQuickChat().send(p, plugin.getQuickChat().getItemHologramChat(shop, items, p, ChatColor.DARK_PURPLE + plugin.text().of(p, "tableformat.left_begin").forLocale() + plugin.text().of(p, "menu.item", Util.getItemStackName(items)).forLocale() + " "));
1258+
plugin.getQuickChat().send(p, plugin.getQuickChat().getItemHologramChat(shop, items, p, ChatColor.DARK_PURPLE + plugin.text().of(p, "tableformat.left_begin").forLocale() + plugin.text().of(p, "menu.item", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).forLocale() + " "));
12591259
if (Util.isTool(items.getType())) {
12601260
chatSheetPrinter.printLine(
12611261
plugin.text().of(p, "menu.damage-percent-remaining", Util.getToolPercentage(items)).forLocale());
@@ -1278,9 +1278,9 @@ public void sendShopInfo(@NotNull Player p, @NotNull Shop shop) {
12781278
}
12791279
}
12801280
if (shop.getItem().getAmount() == 1) {
1281-
chatSheetPrinter.printLine(plugin.text().of(p, "menu.price-per", Util.getItemStackName(shop.getItem()), format(shop.getPrice(), shop)).forLocale());
1281+
chatSheetPrinter.printLine(plugin.text().of(p, "menu.price-per", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()), format(shop.getPrice(), shop)).forLocale());
12821282
} else {
1283-
chatSheetPrinter.printLine(plugin.text().of(p, "menu.price-per-stack", Util.getItemStackName(shop.getItem()), format(shop.getPrice(), shop), Integer.toString(shop.getItem().getAmount())).forLocale());
1283+
chatSheetPrinter.printLine(plugin.text().of(p, "menu.price-per-stack", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()), format(shop.getPrice(), shop), Integer.toString(shop.getItem().getAmount())).forLocale());
12841284
}
12851285
if (shop.isBuying()) {
12861286
chatSheetPrinter.printLine(plugin.text().of(p, "menu.this-shop-is-buying").forLocale());
@@ -1393,7 +1393,7 @@ private void actionTrade(@NotNull Player p, Info info, @NotNull String message)
13931393
if (shopHaveSpaces == 0) {
13941394
// when typed 'all' but the shop doesn't have any empty space
13951395
plugin.text().of(p, "shop-has-no-space", Integer.toString(shopHaveSpaces),
1396-
Util.getItemStackName(shop.getItem())).send();
1396+
MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
13971397
return;
13981398
}
13991399
if (ownerCanAfford == 0
@@ -1413,7 +1413,7 @@ private void actionTrade(@NotNull Player p, Info info, @NotNull String message)
14131413
// when typed 'all' but player doesn't have any items to sell
14141414
plugin.text().of(p, "you-dont-have-that-many-items",
14151415
Integer.toString(amount),
1416-
Util.getItemStackName(shop.getItem())).send();
1416+
MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
14171417
return;
14181418
}
14191419
} else {
@@ -1451,7 +1451,7 @@ private void actionTrade(@NotNull Player p, Info info, @NotNull String message)
14511451
// but also the shop's stock is 0
14521452
plugin.text().of(p, "shop-stock-too-low",
14531453
Integer.toString(shop.getRemainingStock()),
1454-
Util.getItemStackName(shop.getItem())).send();
1454+
MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
14551455
} else {
14561456
// when if player's inventory is full
14571457
if (invHaveSpaces <= 0) {

‎src/main/java/org/maxgamer/quickshop/util/MsgUtil.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import lombok.Getter;
2929
import net.md_5.bungee.api.chat.ComponentBuilder;
3030
import net.md_5.bungee.api.chat.TextComponent;
31+
import net.md_5.bungee.api.chat.TranslatableComponent;
3132
import org.apache.commons.lang.StringUtils;
3233
import org.bukkit.Bukkit;
3334
import org.bukkit.ChatColor;
@@ -167,12 +168,17 @@ public static String fillArgs(@Nullable String raw, @Nullable String... args) {
167168
}
168169
return raw;
169170
}
171+
170172
@Unstable
171173
@Deprecated
172174
public static void loadGameLanguage(@NotNull String languageCode) {
173175
gameLanguage = ServiceInjector.getGameLanguage(new MojangGameLanguageImpl(plugin, languageCode));
174176
}
175177

178+
public static String convertItemStackToTranslateText(Material mat) {
179+
return TextSplitter.bakeComponent(new ComponentBuilder().append(new TranslatableComponent(ReflectFactory.getMaterialMinecraftNamespacedKey(mat))).create());
180+
}
181+
176182
@Unstable
177183
@Deprecated
178184
public static void loadI18nFile() {

0 commit comments

Comments
 (0)