Part.2 Continue impl the multi-language system

Ghost-chu · Ghost-chu · commit a218ffade7fc · 2021-09-26T14:23:01.000+08:00
diff --git a/src/main/java/org/maxgamer/quickshop/command/CommandContainer.java b/src/main/java/org/maxgamer/quickshop/command/CommandContainer.java
@@ -26,7 +26,7 @@
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.maxgamer.quickshop.util.MsgUtil;
+import org.maxgamer.quickshop.QuickShop;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -87,7 +87,7 @@ public void bakeExecutorType() {
         } else if (StringUtils.isNotEmpty(this.getDisablePlaceholder())) {
             return this.getDisablePlaceholder();
         } else {
-            return MsgUtil.getMessage("command.feature-not-enabled", null);
+            return QuickShop.getInstance().text().of(sender,"command.feature-not-enabled").forLocale();
         }
     }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/command/CommandManager.java b/src/main/java/org/maxgamer/quickshop/command/CommandManager.java
@@ -292,7 +292,8 @@ public CommandManager(QuickShop plugin) {
                 .permission("quickshop.create.changeamount")
                 .executor(new SubCommand_Size(plugin))
                 .disabled(!plugin.isAllowStack())
-                .disablePlaceholder(MsgUtil.getMessage("command.feature-not-enabled", null))
+                // TODO: Check the sender
+                .disablePlaceholder(plugin.text().of("command.feature-not-enabled").forLocale())
                 .build());
         registerCmd(CommandContainer.builder()
                 .prefix("item")
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_About.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_About.java
@@ -50,23 +50,23 @@ public void onCommand(@NotNull CommandSender sender, @NotNull String commandLabe
                             + ChatColor.YELLOW
                             + ">> "
                             + ChatColor.GREEN
-                            + MsgUtil.getMessage("updatenotify.label.lts", sender));
+                            +plugin.text().of(sender,"updatenotify.label.lts").forLocale());
         } else if (QuickShop.getInstance().getBuildInfo().getGitBranch().toUpperCase().contains("RELEASE")) {
             MsgUtil.sendDirectMessage(sender,
                     ChatColor.AQUA
                             + "Release "
                             + ChatColor.YELLOW
                             + ">> "
                             + ChatColor.GREEN
-                            + MsgUtil.getMessage("updatenotify.label.stable", sender));
+                            +plugin.text().of(sender,"updatenotify.label.stable").forLocale());
         } else {
             MsgUtil.sendDirectMessage(sender,
                     ChatColor.AQUA
                             + "Release "
                             + ChatColor.YELLOW
                             + ">> "
                             + ChatColor.GREEN
-                            + MsgUtil.getMessage("updatenotify.label.unstable", sender));
+                            + plugin.text().of(sender,"updatenotify.label.unstable").forLocale());
         }
         MsgUtil.sendDirectMessage(sender,
                 ChatColor.AQUA
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Amount.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Amount.java
@@ -24,7 +24,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.command.CommandHandler;
-import org.maxgamer.quickshop.util.MsgUtil;
 
 import java.util.Collections;
 import java.util.List;
@@ -53,7 +52,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
     @Override
     public List<String> onTabComplete(
             @NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
-        return cmdArg.length == 1 ? Collections.singletonList(MsgUtil.getMessage("tabcomplete.amount", sender)) : Collections.emptyList();
+        return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender,"tabcomplete.amount").forLocale()) : Collections.emptyList();
     }
 
 }
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Create.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Create.java
@@ -160,14 +160,14 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
     public List<String> onTabComplete(
             @NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
         if (cmdArg.length == 1) {
-            return Collections.singletonList(MsgUtil.getMessage("tabcomplete.price", sender));
+            return Collections.singletonList(plugin.text().of(sender,"tabcomplete.price").forLocale());
         }
         if (sender.getInventory().getItemInMainHand().getType().isAir()) {
             if (cmdArg.length == 2) {
-                return Collections.singletonList(MsgUtil.getMessage("tabcomplete.item", sender));
+                return Collections.singletonList(plugin.text().of(sender,"tabcomplete.item").forLocale());
             }
             if (cmdArg.length == 3) {
-                return Collections.singletonList(MsgUtil.getMessage("tabcomplete.amount", sender));
+                return Collections.singletonList(plugin.text().of(sender,"tabcomplete.amount").forLocale());
             }
         }
         return Collections.emptyList();
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Find.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Find.java
@@ -126,14 +126,14 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
                     PlayerTeleportEvent.TeleportCause.UNKNOWN);
             plugin.text().of(sender, "nearby-shop-this-way", String.valueOf(closest.getValue().intValue())).send();
         } else {
-            StringBuilder stringBuilder = new StringBuilder(MsgUtil.getMessage("nearby-shop-header", sender, lookFor)).append("\n");
+            StringBuilder stringBuilder = new StringBuilder(plugin.text().of(sender, "nearby-shop-header", lookFor).forLocale()).append("\n");
             for (Map.Entry<Shop, Double> shopDoubleEntry : sortedShops) {
                 Shop shop = shopDoubleEntry.getKey();
                 Location location = shop.getLocation();
                 //  "nearby-shop-entry": "&a- Info:{0} &aPrice:&b{1} &ax:&b{2} &ay:&b{3} &az:&b{4} &adistance: &b{5} &ablock(s)"
-                stringBuilder.append(MsgUtil.getMessage("nearby-shop-entry", sender, shop.getSignText()[1], shop.getSignText()[3], location.getBlockX(), location.getBlockY(), location.getBlockZ(), shopDoubleEntry.getValue().intValue())).append("\n");
+                stringBuilder.append(plugin.text().of(sender, "nearby-shop-entry", shop.getSignText()[1], shop.getSignText()[3], String.valueOf(location.getBlockX()), String.valueOf(location.getBlockY()), String.valueOf(location.getBlockZ()), String.valueOf(shopDoubleEntry.getValue().intValue())).forLocale()).append("\n");
+                MsgUtil.sendDirectMessage(sender, stringBuilder.toString());
             }
-            MsgUtil.sendDirectMessage(sender, stringBuilder.toString());
         }
     }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Help.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Help.java
@@ -25,7 +25,6 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.command.CommandContainer;
 import org.maxgamer.quickshop.command.CommandHandler;
-import org.maxgamer.quickshop.util.MsgUtil;
 
 import java.util.List;
 
@@ -73,7 +72,7 @@ private void sendHelp(@NotNull CommandSender s, @NotNull String commandLabel) {
                 if (!passed) {
                     continue;
                 }
-                String commandDesc = MsgUtil.getMessage("command.description." + container.getPrefix(), s);
+                String commandDesc = plugin.text().of(s, "command.description." + container.getPrefix()).forLocale();
                 if (container.getDescription() != null) {
                     commandDesc = container.getDescription();
                     if (commandDesc == null) {
@@ -82,10 +81,10 @@ private void sendHelp(@NotNull CommandSender s, @NotNull String commandLabel) {
                 }
                 if (container.isDisabled()) {
                     if (QuickShop.getPermissionManager().hasPermission(s, "quickshop.showdisabled")) {
-                        MsgUtil.sendDirectMessage(s, MsgUtil.getMessage("command.format", s, commandLabel, container.getPrefix(), container.getDisableText(s)));
+                        plugin.text().of(s, "command.format", commandLabel, container.getPrefix(), container.getDisableText(s));
                     }
                 } else {
-                    MsgUtil.sendDirectMessage(s, MsgUtil.getMessage("command.format", s, commandLabel, container.getPrefix(), commandDesc));
+                    plugin.text().of(s, "command.format", commandLabel, container.getPrefix(), commandDesc);
                 }
             }
         }
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Price.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Price.java
@@ -184,7 +184,7 @@ else if (cs.getPrice() > nextTo.getPrice()) {
     @Override
     public List<String> onTabComplete(
             @NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
-        return cmdArg.length == 1 ? Collections.singletonList(MsgUtil.getMessage("tabcomplete.price", sender)) : Collections.emptyList();
+        return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender,"tabcomplete.price").forLocale()) : Collections.emptyList();
     }
 
 }
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Refill.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Refill.java
@@ -28,7 +28,6 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.command.CommandHandler;
 import org.maxgamer.quickshop.shop.Shop;
-import org.maxgamer.quickshop.util.MsgUtil;
 
 import java.util.Collections;
 import java.util.List;
@@ -79,7 +78,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
     @NotNull
     @Override
     public List<String> onTabComplete(@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
-        return cmdArg.length == 1 ? Collections.singletonList(MsgUtil.getMessage("tabcomplete.amount", sender)) : Collections.emptyList();
+        return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender,"tabcomplete.amount").forLocale()) : Collections.emptyList();
     }
 
 }
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Size.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Size.java
@@ -29,7 +29,6 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.command.CommandHandler;
 import org.maxgamer.quickshop.shop.Shop;
-import org.maxgamer.quickshop.util.MsgUtil;
 import org.maxgamer.quickshop.util.PriceLimiter;
 import org.maxgamer.quickshop.util.Util;
 
@@ -97,6 +96,6 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
 
     @Override
     public @Nullable List<String> onTabComplete(@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
-        return cmdArg.length == 1 ? Collections.singletonList(MsgUtil.getMessage("tabcomplete.amount", sender)) : Collections.emptyList();
+        return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender,"tabcomplete.amount").forLocale()) : Collections.emptyList();
     }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Staff.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Staff.java
@@ -71,14 +71,14 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
                             if (staffs.isEmpty()) {
                                 MsgUtil.sendDirectMessage(sender,
                                         ChatColor.GREEN
-                                                + MsgUtil.getMessage("tableformat.left_begin", sender)
+                                                + plugin.text().of(sender,"tableformat.left_begin").forLocale()
                                                 + "Empty");
                                 return;
                             }
                             for (UUID uuid : staffs) {
                                 MsgUtil.sendDirectMessage(sender,
                                         ChatColor.GREEN
-                                                + MsgUtil.getMessage("tableformat.left_begin", sender)
+                                                + plugin.text().of(sender,"tableformat.left_begin").forLocale()
                                                 + Bukkit.getOfflinePlayer(uuid).getName());
                             }
                             return;
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SuperCreate.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SuperCreate.java
@@ -30,7 +30,6 @@
 import org.maxgamer.quickshop.command.CommandHandler;
 import org.maxgamer.quickshop.shop.Info;
 import org.maxgamer.quickshop.shop.ShopAction;
-import org.maxgamer.quickshop.util.MsgUtil;
 import org.maxgamer.quickshop.util.Util;
 
 import java.util.Collections;
@@ -76,7 +75,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
     @Override
     public List<String> onTabComplete(
             @NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
-        return cmdArg.length == 1 ? Collections.singletonList(MsgUtil.getMessage("tabcomplete.amount", sender)) : Collections.emptyList();
+        return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender,"tabcomplete.amount").forLocale()) : Collections.emptyList();
     }
 
 }
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java b/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java
@@ -42,7 +42,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.event.*;
-import org.maxgamer.quickshop.util.MsgUtil;
 import org.maxgamer.quickshop.util.PriceLimiter;
 import org.maxgamer.quickshop.util.Util;
 
@@ -1033,15 +1032,15 @@ public void setShopType(@NotNull ShopType newShopType) {
                 signs.add(sign);
             } else {
                 String header = lines[0];
-                String adminShopHeader = MsgUtil.getMessage("signs.header", null, MsgUtil.getMessage("admin-shop", null));
-                String signHeaderUsername = MsgUtil.getMessage("signs.header", null, this.ownerName(true));
+                String adminShopHeader = plugin.text().of("signs.header",plugin.text().of("admin-shop").forLocale()).forLocale();
+                String signHeaderUsername = plugin.text().of("signs.header", this.ownerName(true)).forLocale();
                 if (header.contains(adminShopHeader) || header.contains(signHeaderUsername)) {
                     signs.add(sign);
                     //TEXT SIGN
                     //continue
                 } else {
-                    adminShopHeader = MsgUtil.getMessage("signs.header", null, MsgUtil.getMessage("admin-shop", null), "");
-                    signHeaderUsername = MsgUtil.getMessage("signs.header", null, this.ownerName(true), "");
+                    adminShopHeader = plugin.text().of("signs.header",  plugin.text().of("admin-shop").forLocale(), "").forLocale();
+                    signHeaderUsername = plugin.text().of("signs.header",  this.ownerName(true), "").forLocale();
                     adminShopHeader = ChatColor.stripColor(adminShopHeader).trim();
                     signHeaderUsername = ChatColor.stripColor(signHeaderUsername).trim();
                     if (header.contains(adminShopHeader) || header.contains(signHeaderUsername)) {
diff --git a/src/main/java/org/maxgamer/quickshop/shop/InventoryPreview.java b/src/main/java/org/maxgamer/quickshop/shop/InventoryPreview.java
@@ -32,7 +32,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.event.ShopInventoryPreviewEvent;
-import org.maxgamer.quickshop.util.MsgUtil;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.holder.QuickShopPreviewGUIHolder;
 
@@ -113,7 +112,7 @@ public void show() {
         }
         final int size = 9;
 
-        inventory = plugin.getServer().createInventory(new QuickShopPreviewGUIHolder(), size, MsgUtil.getMessage("menu.preview", player));
+        inventory = plugin.getServer().createInventory(new QuickShopPreviewGUIHolder(), size, plugin.text().of(player,"menu.preview").forLocale());
         for (int i = 0; i < size; i++) {
             inventory.setItem(i, itemStack);
         }
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ShopManager.java b/src/main/java/org/maxgamer/quickshop/shop/ShopManager.java
@@ -716,16 +716,16 @@ public void actionBuy(
         Player player = plugin.getServer().getPlayer(buyer);
 
 
-        String msg = MsgUtil.getMessage(buyer, "player-sold-to-your-store",
+        String msg = plugin.text().of(buyer, "player-sold-to-your-store",
                 player != null ? player.getName() : buyer.toString(),
                 String.valueOf(amount),
-                Util.getItemStackName(shop.getItem()));
+                Util.getItemStackName(shop.getItem())).forLocale();
 
         if (space == amount) {
-            msg += "\n" + MsgUtil.getMessage(buyer, "shop-out-of-space",
+            msg += "\n" + plugin.text().of(buyer, "shop-out-of-space",
                     Integer.toString(shop.getLocation().getBlockX()),
                     Integer.toString(shop.getLocation().getBlockY()),
-                    Integer.toString(shop.getLocation().getBlockZ()));
+                    Integer.toString(shop.getLocation().getBlockZ())).forLocale();
         }
 
         MsgUtil.TransactionMessage transactionMessage = new MsgUtil.TransactionMessage(msg, Util.serialize(shop.getItem()), null);
@@ -1080,26 +1080,26 @@ public void actionSell(
         // Notify the shop owner //TODO: move to a standalone method
         Player player = plugin.getServer().getPlayer(seller);
         if (plugin.getConfig().getBoolean("show-tax")) {
-            msg = MsgUtil.getMessage(seller, "player-bought-from-your-store-tax",
+            msg = plugin.text().of(seller, "player-bought-from-your-store-tax",
                     player != null ? player.getName() : seller.toString(),
                     Integer.toString(amount * shop.getItem().getAmount()),
                     Util.getItemStackName(shop.getItem()),
                     Double.toString(total),
-                    Util.format(CalculateUtil.multiply(taxModifier, total), shop));
+                    Util.format(CalculateUtil.multiply(taxModifier, total), shop)).forLocale();
         } else {
-            msg = MsgUtil.getMessage(seller, "player-bought-from-your-store",
+            msg = plugin.text().of(seller, "player-bought-from-your-store",
                     player != null ? player.getName() : seller.toString(),
                     Integer.toString(amount * shop.getItem().getAmount()),
                     Util.getItemStackName(shop.getItem()),
-                    Double.toString(total));
+                    Double.toString(total)).forLocale();
         }
         // Transfers the item from A to B
         if (stock == amount) {
-            msg += "\n" + MsgUtil.getMessage(seller, "shop-out-of-stock",
+            msg += "\n" +plugin.text().of(seller, "shop-out-of-stock",
                     Integer.toString(shop.getLocation().getBlockX()),
                     Integer.toString(shop.getLocation().getBlockY()),
                     Integer.toString(shop.getLocation().getBlockZ()),
-                    Util.getItemStackName(shop.getItem()));
+                    Util.getItemStackName(shop.getItem())).forLocale();
         }
 
         MsgUtil.TransactionMessage transactionMessage = new MsgUtil.TransactionMessage(msg, Util.serialize(shop.getItem()), null);
diff --git a/src/main/java/org/maxgamer/quickshop/util/ChatSheetPrinter.java b/src/main/java/org/maxgamer/quickshop/util/ChatSheetPrinter.java
@@ -44,9 +44,9 @@ public void printCenterLine(@NotNull String text) {
         if (!text.isEmpty()) {
             MsgUtil.sendDirectMessage(p,
                     ChatColor.DARK_PURPLE
-                            + MsgUtil.getMessage("tableformat.left_half_line", p)
+                            + QuickShop.getInstance().text().of(p,"tableformat.left_half_line").forLocale()
                             + text
-                            + MsgUtil.getMessage("tableformat.right_half_line", p));
+                            + QuickShop.getInstance().text().of(p,"tableformat.right_half_line").forLocale());
         }
     }
 
@@ -60,18 +60,18 @@ public void printExecutableCmdLine(
     }
 
     public void printFooter() {
-        MsgUtil.sendDirectMessage(p, ChatColor.DARK_PURPLE + MsgUtil.getMessage("tableformat.full_line", p));
+        MsgUtil.sendDirectMessage(p, ChatColor.DARK_PURPLE +QuickShop.getInstance().text().of(p,"tableformat.full_line").forLocale());
     }
 
     public void printHeader() {
-        MsgUtil.sendDirectMessage(p, ChatColor.DARK_PURPLE + MsgUtil.getMessage("tableformat.full_line", p));
+        MsgUtil.sendDirectMessage(p, ChatColor.DARK_PURPLE + QuickShop.getInstance().text().of(p,"tableformat.full_line").forLocale());
     }
 
     public void printLine(@NotNull String text) {
         String[] texts = text.split("\n");
         for (String str : texts) {
             if (!str.isEmpty()) {
-                MsgUtil.sendDirectMessage(p, ChatColor.DARK_PURPLE + MsgUtil.getMessage("tableformat.left_begin", p) + str);
+                MsgUtil.sendDirectMessage(p, ChatColor.DARK_PURPLE + QuickShop.getInstance().text().of(p,"tableformat.left_begin").forLocale() + str);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`import org.bukkit.command.CommandSender;`
`27`	`27`	`import org.jetbrains.annotations.NotNull;`
`28`	`28`	`import org.jetbrains.annotations.Nullable;`
`29`		`-import org.maxgamer.quickshop.util.MsgUtil;`
	`29`	`+import org.maxgamer.quickshop.QuickShop;`
`30`	`30`
`31`	`31`	`import java.lang.reflect.Method;`
`32`	`32`	`import java.util.List;`
`@@ -87,7 +87,7 @@ public void bakeExecutorType() {`
`87`	`87`	`} else if (StringUtils.isNotEmpty(this.getDisablePlaceholder())) {`
`88`	`88`	`return this.getDisablePlaceholder();`
`89`	`89`	`} else {`
`90`		`- return MsgUtil.getMessage("command.feature-not-enabled", null);`
	`90`	`+ return QuickShop.getInstance().text().of(sender,"command.feature-not-enabled").forLocale();`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`import org.jetbrains.annotations.NotNull;`
`25`	`25`	`import org.maxgamer.quickshop.QuickShop;`
`26`	`26`	`import org.maxgamer.quickshop.command.CommandHandler;`
`27`		`-import org.maxgamer.quickshop.util.MsgUtil;`
`28`	`27`
`29`	`28`	`import java.util.Collections;`
`30`	`29`	`import java.util.List;`
`@@ -53,7 +52,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not`
`53`	`52`	`@Override`
`54`	`53`	`public List<String> onTabComplete(`
`55`	`54`	`@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {`
`56`		`- return cmdArg.length == 1 ? Collections.singletonList(MsgUtil.getMessage("tabcomplete.amount", sender)) : Collections.emptyList();`
	`55`	`+ return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender,"tabcomplete.amount").forLocale()) : Collections.emptyList();`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,14 +160,14 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not`
`160`	`160`	`public List<String> onTabComplete(`
`161`	`161`	`@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {`
`162`	`162`	`if (cmdArg.length == 1) {`
`163`		`- return Collections.singletonList(MsgUtil.getMessage("tabcomplete.price", sender));`
	`163`	`+ return Collections.singletonList(plugin.text().of(sender,"tabcomplete.price").forLocale());`
`164`	`164`	`}`
`165`	`165`	`if (sender.getInventory().getItemInMainHand().getType().isAir()) {`
`166`	`166`	`if (cmdArg.length == 2) {`
`167`		`- return Collections.singletonList(MsgUtil.getMessage("tabcomplete.item", sender));`
	`167`	`+ return Collections.singletonList(plugin.text().of(sender,"tabcomplete.item").forLocale());`
`168`	`168`	`}`
`169`	`169`	`if (cmdArg.length == 3) {`
`170`		`- return Collections.singletonList(MsgUtil.getMessage("tabcomplete.amount", sender));`
	`170`	`+ return Collections.singletonList(plugin.text().of(sender,"tabcomplete.amount").forLocale());`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`return Collections.emptyList();`
Original file line number	Diff line number	Diff line change
`@@ -126,14 +126,14 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not`
`126`	`126`	`PlayerTeleportEvent.TeleportCause.UNKNOWN);`
`127`	`127`	`plugin.text().of(sender, "nearby-shop-this-way", String.valueOf(closest.getValue().intValue())).send();`
`128`	`128`	`} else {`
`129`		`- StringBuilder stringBuilder = new StringBuilder(MsgUtil.getMessage("nearby-shop-header", sender, lookFor)).append("\n");`
	`129`	`+ StringBuilder stringBuilder = new StringBuilder(plugin.text().of(sender, "nearby-shop-header", lookFor).forLocale()).append("\n");`
`130`	`130`	`for (Map.Entry<Shop, Double> shopDoubleEntry : sortedShops) {`
`131`	`131`	`Shop shop = shopDoubleEntry.getKey();`
`132`	`132`	`Location location = shop.getLocation();`
`133`	`133`	`// "nearby-shop-entry": "&a- Info:{0} &aPrice:&b{1} &ax:&b{2} &ay:&b{3} &az:&b{4} &adistance: &b{5} &ablock(s)"`
`134`		`- stringBuilder.append(MsgUtil.getMessage("nearby-shop-entry", sender, shop.getSignText()[1], shop.getSignText()[3], location.getBlockX(), location.getBlockY(), location.getBlockZ(), shopDoubleEntry.getValue().intValue())).append("\n");`
	`134`	`+ stringBuilder.append(plugin.text().of(sender, "nearby-shop-entry", shop.getSignText()[1], shop.getSignText()[3], String.valueOf(location.getBlockX()), String.valueOf(location.getBlockY()), String.valueOf(location.getBlockZ()), String.valueOf(shopDoubleEntry.getValue().intValue())).forLocale()).append("\n");`
	`135`	`+ MsgUtil.sendDirectMessage(sender, stringBuilder.toString());`
`135`	`136`	`}`
`136`		`- MsgUtil.sendDirectMessage(sender, stringBuilder.toString());`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`import org.maxgamer.quickshop.QuickShop;`
`26`	`26`	`import org.maxgamer.quickshop.command.CommandContainer;`
`27`	`27`	`import org.maxgamer.quickshop.command.CommandHandler;`
`28`		`-import org.maxgamer.quickshop.util.MsgUtil;`
`29`	`28`
`30`	`29`	`import java.util.List;`
`31`	`30`
`@@ -73,7 +72,7 @@ private void sendHelp(@NotNull CommandSender s, @NotNull String commandLabel) {`
`73`	`72`	`if (!passed) {`
`74`	`73`	`continue;`
`75`	`74`	`}`
`76`		`- String commandDesc = MsgUtil.getMessage("command.description." + container.getPrefix(), s);`
	`75`	`+ String commandDesc = plugin.text().of(s, "command.description." + container.getPrefix()).forLocale();`
`77`	`76`	`if (container.getDescription() != null) {`
`78`	`77`	`commandDesc = container.getDescription();`
`79`	`78`	`if (commandDesc == null) {`
`@@ -82,10 +81,10 @@ private void sendHelp(@NotNull CommandSender s, @NotNull String commandLabel) {`
`82`	`81`	`}`
`83`	`82`	`if (container.isDisabled()) {`
`84`	`83`	`if (QuickShop.getPermissionManager().hasPermission(s, "quickshop.showdisabled")) {`
`85`		`- MsgUtil.sendDirectMessage(s, MsgUtil.getMessage("command.format", s, commandLabel, container.getPrefix(), container.getDisableText(s)));`
	`84`	`+ plugin.text().of(s, "command.format", commandLabel, container.getPrefix(), container.getDisableText(s));`
`86`	`85`	`}`
`87`	`86`	`} else {`
`88`		`- MsgUtil.sendDirectMessage(s, MsgUtil.getMessage("command.format", s, commandLabel, container.getPrefix(), commandDesc));`
	`87`	`+ plugin.text().of(s, "command.format", commandLabel, container.getPrefix(), commandDesc);`
`89`	`88`	`}`
`90`	`89`	`}`
`91`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ else if (cs.getPrice() > nextTo.getPrice()) {`
`184`	`184`	`@Override`
`185`	`185`	`public List<String> onTabComplete(`
`186`	`186`	`@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {`
`187`		`- return cmdArg.length == 1 ? Collections.singletonList(MsgUtil.getMessage("tabcomplete.price", sender)) : Collections.emptyList();`
	`187`	`+ return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender,"tabcomplete.price").forLocale()) : Collections.emptyList();`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`	`import org.maxgamer.quickshop.QuickShop;`
`29`	`29`	`import org.maxgamer.quickshop.command.CommandHandler;`
`30`	`30`	`import org.maxgamer.quickshop.shop.Shop;`
`31`		`-import org.maxgamer.quickshop.util.MsgUtil;`
`32`	`31`
`33`	`32`	`import java.util.Collections;`
`34`	`33`	`import java.util.List;`
`@@ -79,7 +78,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not`
`79`	`78`	`@NotNull`
`80`	`79`	`@Override`
`81`	`80`	`public List<String> onTabComplete(@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {`
`82`		`- return cmdArg.length == 1 ? Collections.singletonList(MsgUtil.getMessage("tabcomplete.amount", sender)) : Collections.emptyList();`
	`81`	`+ return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender,"tabcomplete.amount").forLocale()) : Collections.emptyList();`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@`
`29`	`29`	`import org.maxgamer.quickshop.QuickShop;`
`30`	`30`	`import org.maxgamer.quickshop.command.CommandHandler;`
`31`	`31`	`import org.maxgamer.quickshop.shop.Shop;`
`32`		`-import org.maxgamer.quickshop.util.MsgUtil;`
`33`	`32`	`import org.maxgamer.quickshop.util.PriceLimiter;`
`34`	`33`	`import org.maxgamer.quickshop.util.Util;`
`35`	`34`
`@@ -97,6 +96,6 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not`
`97`	`96`
`98`	`97`	`@Override`
`99`	`98`	`public @Nullable List<String> onTabComplete(@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {`
`100`		`- return cmdArg.length == 1 ? Collections.singletonList(MsgUtil.getMessage("tabcomplete.amount", sender)) : Collections.emptyList();`
	`99`	`+ return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender,"tabcomplete.amount").forLocale()) : Collections.emptyList();`
`101`	`100`	`}`
`102`	`101`	`}`