From 54a3c9de16f1cd4c9e104b51181bb57beac9825c Mon Sep 17 00:00:00 2001 From: sandtechnology <20417547+sandtechnology@users.noreply.github.com> Date: Tue, 22 Sep 2020 12:31:11 +0800 Subject: [PATCH] 4.0.4.10 (#572) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * New translations messages.json (German) * New translations messages.json (Finnish) * New translations messages.json (Portuguese, Brazilian) * Add null checking in enchantment displaying * #562 Force using QS Matcher in 1.16 server * Fix #563 * New translations messages.json (Chinese Traditional) * Correct spigot bug link * Some optimization 1.Replace Calendar API to Instant API in LogWatcher#log 2.Skipping getConnection return when sqlqueue is empty 3.Re-use OfflinePlayer in Shop#ownerName 4.Some logic optimize in MsgUtil#send and Util#deserialize, pervent using Util#deserialize (which double about 5000μs) 5.Rename player_messages to outGoingPlayerMessages * Another optimization 1.Reduce calling getBalance and format method 2.Fix time bug in qs.log 3.Re-work logging option * Add missing option to disable debug logger * #568 Add Spartan support * New translations messages.json (Japanese) * New translations messages.json (Romanian) * New translations messages.json (Japanese) * New translations messages.json (Romanian) * New translations messages.json (Romanian) * New translations messages.json (Chinese Simplified) * 4.0.4.10 Co-authored-by: Ghost_chu <30802565+Ghost-chu@users.noreply.github.com> Former-commit-id: 00cfee3b63a34a0924d4ce0aaacb4f4884a61f5a --- lib/SpartanAPI.jar | Bin 0 -> 15405 bytes pom.xml | 9 +- .../org/maxgamer/quickshop/QuickShop.java | 18 +- .../maxgamer/quickshop/RuntimeCatcher.java | 7 + .../builtinlistener/InternalListener.java | 139 +++++----- .../quickshop/command/CommandManager.java | 4 +- .../quickshop/database/DatabaseManager.java | 3 + .../quickshop/economy/EconomyTransaction.java | 34 ++- .../quickshop/shop/ContainerShop.java | 8 +- .../maxgamer/quickshop/shop/ShopManager.java | 4 +- .../org/maxgamer/quickshop/util/MsgUtil.java | 111 +++++--- .../org/maxgamer/quickshop/util/Util.java | 9 +- .../SpartanCompatibilityModule.java | 42 +++ .../quickshop/watcher/LogWatcher.java | 12 +- .../quickshop/watcher/OngoingFeeWatcher.java | 4 +- src/main/resources/config.yml | 21 +- src/main/resources/lang/de-DE/messages.json | 2 +- src/main/resources/lang/fi-FI/messages.json | 8 +- src/main/resources/lang/ja-JP/messages.json | 246 +++++++++--------- src/main/resources/lang/pt-BR/messages.json | 2 +- src/main/resources/lang/ro-RO/messages.json | 176 ++++++------- src/main/resources/lang/zh-CN/messages.json | 4 +- src/main/resources/lang/zh-TW/messages.json | 2 +- 23 files changed, 515 insertions(+), 350 deletions(-) create mode 100644 lib/SpartanAPI.jar create mode 100644 src/main/java/org/maxgamer/quickshop/util/compatibility/SpartanCompatibilityModule.java diff --git a/lib/SpartanAPI.jar b/lib/SpartanAPI.jar new file mode 100644 index 0000000000000000000000000000000000000000..1f2d578a14103df362628c2d461c260fda90635f GIT binary patch literal 15405 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 literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index 1878af001..d509741f9 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.maxgamer QuickShop - 4.0.4.9 + 4.0.4.10 @@ -390,6 +390,13 @@ + + me.vagdedes.spartan + SpartanAPI + 1.0 + system + ${basedir}/lib/SpartanAPI.jar + de.themoep.idconverter Towny diff --git a/src/main/java/org/maxgamer/quickshop/QuickShop.java b/src/main/java/org/maxgamer/quickshop/QuickShop.java index 00b1b6321..93255f974 100644 --- a/src/main/java/org/maxgamer/quickshop/QuickShop.java +++ b/src/main/java/org/maxgamer/quickshop/QuickShop.java @@ -59,6 +59,7 @@ import org.maxgamer.quickshop.util.bukkitwrapper.BukkitAPIWrapper; import org.maxgamer.quickshop.util.bukkitwrapper.SpigotWrapper; import org.maxgamer.quickshop.util.compatibility.CompatibilityManager; import org.maxgamer.quickshop.util.compatibility.NCPCompatibilityModule; +import org.maxgamer.quickshop.util.compatibility.SpartanCompatibilityModule; import org.maxgamer.quickshop.util.matcher.item.BukkitItemMatcherImpl; import org.maxgamer.quickshop.util.matcher.item.ItemMatcher; import org.maxgamer.quickshop.util.matcher.item.QuickShopItemMatcherImpl; @@ -345,6 +346,9 @@ public class QuickShop extends JavaPlugin { if (Bukkit.getPluginManager().getPlugin("NoCheatPlus") != null) { compatibilityTool.register(new NCPCompatibilityModule(this)); } + if (Bukkit.getPluginManager().getPlugin("Spartan") != null) { + compatibilityTool.register(new SpartanCompatibilityModule(this)); + } if (this.display) { //VirtualItem support if (DisplayItem.getNowUsing() == DisplayType.VIRTUALITEM) { @@ -494,7 +498,7 @@ public class QuickShop extends JavaPlugin { this.displayItemCheckTicks = this.getConfig().getInt("shop.display-items-check-ticks"); this.allowStack = this.getConfig().getBoolean("shop.allow-stacks"); language = new Language(this); // Init locale - if (this.getConfig().getBoolean("log-actions")) { + if (this.getConfig().getBoolean("logging.enable")) { logWatcher = new LogWatcher(this, new File(getDataFolder(), "qs.log")); } else { logWatcher = null; @@ -1647,7 +1651,17 @@ public class QuickShop extends JavaPlugin { getConfig().set("config-version", 111); selectedVersion = 111; } - + if (selectedVersion == 111) { + getConfig().set("logging.enable", getConfig().getBoolean("log-actions")); + getConfig().set("logging.log-actions", getConfig().getBoolean("log-actions")); + getConfig().set("logging.log-balance", true); + getConfig().set("logging.file-size", 10); + getConfig().set("debug.disable-debuglogger", false); + getConfig().set("trying-fix-banlance-insuffient", false); + getConfig().set("log-actions", null); + getConfig().set("config-version", 112); + selectedVersion = 112; + } saveConfig(); reloadConfig(); diff --git a/src/main/java/org/maxgamer/quickshop/RuntimeCatcher.java b/src/main/java/org/maxgamer/quickshop/RuntimeCatcher.java index 2959f20e3..8d3a90e53 100644 --- a/src/main/java/org/maxgamer/quickshop/RuntimeCatcher.java +++ b/src/main/java/org/maxgamer/quickshop/RuntimeCatcher.java @@ -45,6 +45,13 @@ public class RuntimeCatcher { plugin.getLogger().warning("Alert: QuickShop may not fully support your current version " + nmsVersion + "/" + ReflectFactory.getServerVersion() + ", Some features may not working."); } + if (gameVersion == GameVersion.v1_16_R1 || gameVersion == GameVersion.v1_16_R2 || gameVersion == GameVersion.UNKNOWN) { + plugin.getLogger().warning("Force using QS Matcher due to a spigot bug: https://hub.spigotmc.org/jira/browse/SPIGOT-5063"); + plugin.getConfig().set("matcher.work-type", 0); + plugin.saveConfig(); + } + + if (!isSpigotBasedServer(plugin)) { plugin.getLogger().severe("FATAL: QSRR can only be run on Spigot servers and forks of Spigot!"); throw new RuntimeException("Server must be Spigot based, Don't use CraftBukkit!"); diff --git a/src/main/java/org/maxgamer/quickshop/builtinlistener/InternalListener.java b/src/main/java/org/maxgamer/quickshop/builtinlistener/InternalListener.java index 7252e49c3..c16f2dc57 100644 --- a/src/main/java/org/maxgamer/quickshop/builtinlistener/InternalListener.java +++ b/src/main/java/org/maxgamer/quickshop/builtinlistener/InternalListener.java @@ -20,7 +20,6 @@ package org.maxgamer.quickshop.builtinlistener; -import lombok.AllArgsConstructor; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -29,91 +28,113 @@ import org.maxgamer.quickshop.event.*; import org.maxgamer.quickshop.shop.ShopType; import org.maxgamer.quickshop.util.Util; -@AllArgsConstructor + public class InternalListener implements Listener { private final QuickShop plugin; + private final boolean loggingBalance; + private final boolean loggingAction; + + public InternalListener(QuickShop plugin) { + this.plugin = plugin; + this.loggingBalance = plugin.getConfig().getBoolean("logging.log-balance"); + this.loggingAction = plugin.getConfig().getBoolean("logging.log-actions"); + } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void shopCreate(ShopCreateEvent event) { - plugin.log( - "Player " - + event.getPlayer().getName() - + " created a shop at location " - + event.getShop().getLocation()); + if (loggingAction) { + plugin.log( + "Player " + + event.getPlayer().getName() + + " created a shop at location " + + event.getShop().getLocation()); + } } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void shopDelete(ShopDeleteEvent event) { - plugin.log("Shop at " + event.getShop().getLocation() + " was removed."); + if (loggingAction) { + plugin.log("Shop at " + event.getShop().getLocation() + " was removed."); + } } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void shopModeratorChanges(ShopModeratorChangedEvent event) { - plugin.log( - "Shop at location " - + event.getShop().getLocation() - + " moderator was changed to " - + event.getModerator()); + if (loggingAction) { + plugin.log( + "Shop at location " + + event.getShop().getLocation() + + " moderator was changed to " + + event.getModerator()); + } } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void shopPriceChanges(ShopPriceChangeEvent event) { - plugin.log( - "Shop at location " - + event.getShop().getLocation() - + " price was changed from " - + event.getOldPrice() - + " to " - + event.getNewPrice()); + if (loggingAction) { + plugin.log( + "Shop at location " + + event.getShop().getLocation() + + " price was changed from " + + event.getOldPrice() + + " to " + + event.getNewPrice()); + } } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void shopPrePurchase(ShopPurchaseEvent event) { - plugin.log("Player " + event.getPlayer().getName() + " had " + plugin.getEconomy().getBalance(event.getPlayer().getUniqueId()) + " before trading."); - plugin.log("Shop Owner " + event.getShop().ownerName() + " had " + plugin.getEconomy().getBalance(event.getShop().getOwner()) + " before trading."); + if (loggingBalance) { + plugin.log("Player " + event.getPlayer().getName() + " had " + plugin.getEconomy().getBalance(event.getPlayer().getUniqueId()) + " before trading."); + plugin.log("Shop Owner " + event.getShop().ownerName() + " had " + plugin.getEconomy().getBalance(event.getShop().getOwner()) + " before trading."); + } } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void shopPurchase(ShopSuccessPurchaseEvent event) { - if (event.getShop().getShopType() == ShopType.BUYING) { - plugin.log( - "Player " - + event.getPlayer().getName() - + " sold " - + event.getShop().ownerName() - + " shop " - + event.getShop() - + " for" - + Util.getItemStackName(event.getShop().getItem()) - + "x" + - +event.getAmount() - + " for " - + plugin.getEconomy().format(event.getBalance()) - + " (" - + plugin.getEconomy().format(event.getTax()) - + " tax)."); - } - if (event.getShop().getShopType() == ShopType.SELLING) { - plugin.log( - "Player " - + event.getPlayer().getName() - + " bought " - + event.getShop().ownerName() - + " shop " - + event.getShop() - + " for " - + Util.getItemStackName(event.getShop().getItem()) - + " x" - + event.getAmount() - + " for " - + plugin.getEconomy().format(event.getBalance()) - + " (" - + plugin.getEconomy().format(event.getTax()) - + " tax)."); + if (loggingAction) { + if (event.getShop().getShopType() == ShopType.BUYING) { + plugin.log( + "Player " + + event.getPlayer().getName() + + " sold " + + event.getShop().ownerName() + + " shop " + + event.getShop() + + " for" + + Util.getItemStackName(event.getShop().getItem()) + + "x" + + +event.getAmount() + + " for " + + event.getBalance() + + " (" + + event.getTax() + + " tax)."); + } + if (event.getShop().getShopType() == ShopType.SELLING) { + plugin.log( + "Player " + + event.getPlayer().getName() + + " bought " + + event.getShop().ownerName() + + " shop " + + event.getShop() + + " for " + + Util.getItemStackName(event.getShop().getItem()) + + " x" + + event.getAmount() + + " for " + + event.getBalance() + + " (" + + event.getTax() + + " tax)."); + } + } + if (loggingBalance) { + plugin.log("Player " + event.getPlayer().getName() + " had " + plugin.getEconomy().getBalance(event.getPlayer().getUniqueId()) + " after trading."); + plugin.log("Shop Owner " + event.getShop().ownerName() + " had " + plugin.getEconomy().getBalance(event.getShop().getOwner()) + " after trading."); } - plugin.log("Player " + event.getPlayer().getName() + " had " + plugin.getEconomy().getBalance(event.getPlayer().getUniqueId()) + " after trading."); - plugin.log("Shop Owner " + event.getShop().ownerName() + " had " + plugin.getEconomy().getBalance(event.getShop().getOwner()) + " after trading."); } } diff --git a/src/main/java/org/maxgamer/quickshop/command/CommandManager.java b/src/main/java/org/maxgamer/quickshop/command/CommandManager.java index 06d01c581..cd4096334 100644 --- a/src/main/java/org/maxgamer/quickshop/command/CommandManager.java +++ b/src/main/java/org/maxgamer/quickshop/command/CommandManager.java @@ -350,7 +350,7 @@ public class CommandManager implements TabCompleter, CommandExecutor { @NotNull Command command, @NotNull String commandLabel, @NotNull String[] cmdArg) { - if (plugin.getBootError() != null && !cmdArg[0].equalsIgnoreCase("paste")) { + if (plugin.getBootError() != null && (cmdArg.length == 1 && !cmdArg[0].equalsIgnoreCase("paste"))) { plugin.getBootError().printErrors(sender); return true; } @@ -362,7 +362,7 @@ public class CommandManager implements TabCompleter, CommandExecutor { } String[] passthroughArgs; - if (cmdArg.length != 0) { + if (cmdArg.length > 0) { passthroughArgs = new String[cmdArg.length - 1]; System.arraycopy(cmdArg, 1, passthroughArgs, 0, passthroughArgs.length); } else { diff --git a/src/main/java/org/maxgamer/quickshop/database/DatabaseManager.java b/src/main/java/org/maxgamer/quickshop/database/DatabaseManager.java index 3b48f452a..75445023f 100644 --- a/src/main/java/org/maxgamer/quickshop/database/DatabaseManager.java +++ b/src/main/java/org/maxgamer/quickshop/database/DatabaseManager.java @@ -88,6 +88,9 @@ public class DatabaseManager { * Internal method, runTasks in queue. */ private synchronized void runTask() { // synchronized for QUICKSHOP-WX + if (sqlQueue.isEmpty()) { + return; + } try { Connection connection = this.database.getConnection(); //start our commit diff --git a/src/main/java/org/maxgamer/quickshop/economy/EconomyTransaction.java b/src/main/java/org/maxgamer/quickshop/economy/EconomyTransaction.java index 72c768f0f..8d9b1246a 100644 --- a/src/main/java/org/maxgamer/quickshop/economy/EconomyTransaction.java +++ b/src/main/java/org/maxgamer/quickshop/economy/EconomyTransaction.java @@ -45,12 +45,14 @@ public class EconomyTransaction { private final double tax; private final UUID taxAccount; private final boolean allowLoan; + private final boolean tryingFixBanlanceInsuffient; @Getter private TransactionSteps steps; //For rollback @Nullable @Getter private String lastError = null; + /** * Create a transaction * @@ -82,12 +84,20 @@ public class EconomyTransaction { lastError = "From and To cannot be null in same time."; throw new IllegalArgumentException("From and To cannot be null in same time."); } - //Fetch some stupid plugin caching - if (from != null) { - this.core.getBalance(from); + //For passing Test + if (QuickShop.getInstance() != null) { + this.tryingFixBanlanceInsuffient = QuickShop.getInstance().getConfig().getBoolean("trying-fix-banlance-insuffient"); + } else { + this.tryingFixBanlanceInsuffient = false; } - if (to != null) { - this.core.getBalance(to); + if (tryingFixBanlanceInsuffient) { + //Fetch some stupid plugin caching + if (from != null) { + this.core.getBalance(from); + } + if (to != null) { + this.core.getBalance(to); + } } } @@ -115,12 +125,14 @@ public class EconomyTransaction { return this.commit(new TransactionCallback() { @Override public void onSuccess(@NotNull EconomyTransaction economyTransaction) { - //Fetch some stupid plugin caching - if (from != null) { - core.getBalance(from); - } - if (to != null) { - core.getBalance(to); + if (tryingFixBanlanceInsuffient) { + //Fetch some stupid plugin caching + if (from != null) { + core.getBalance(from); + } + if (to != null) { + core.getBalance(to); + } } } }); diff --git a/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java b/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java index 028509b22..cf3798b93 100644 --- a/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java +++ b/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java @@ -470,17 +470,17 @@ public class ContainerShop implements Shop { @Override public @NotNull String ownerName(boolean forceUsername) { - String name = Bukkit.getOfflinePlayer(this.getOwner()).getName(); + OfflinePlayer player = Bukkit.getOfflinePlayer(this.getOwner()); + String name = player.getName(); if (name == null || name.isEmpty()) { name = MsgUtil.getMessageOfflinePlayer( - "unknown-owner", Bukkit.getOfflinePlayer(this.getOwner())); + "unknown-owner", player); } if (forceUsername) { return name; } if (isUnlimited()) { - return MsgUtil.getMessageOfflinePlayer( - "admin-shop", Bukkit.getOfflinePlayer(this.getOwner())); + return MsgUtil.getMessageOfflinePlayer("admin-shop", player); } return name; } diff --git a/src/main/java/org/maxgamer/quickshop/shop/ShopManager.java b/src/main/java/org/maxgamer/quickshop/shop/ShopManager.java index d7c00d056..9acbbcd66 100644 --- a/src/main/java/org/maxgamer/quickshop/shop/ShopManager.java +++ b/src/main/java/org/maxgamer/quickshop/shop/ShopManager.java @@ -590,7 +590,7 @@ public class ShopManager { if (space == amount) { msg += "\n" + MsgUtil.getMessage("shop-out-of-space", p, Integer.toString(shop.getLocation().getBlockX()), Integer.toString(shop.getLocation().getBlockY()), Integer.toString(shop.getLocation().getBlockZ())); } - MsgUtil.send(shop.getOwner(), msg, shop.isUnlimited()); + MsgUtil.send(shop, shop.getOwner(), msg); shop.buy(p, amount); MsgUtil.sendSellSuccess(p, shop, amount); ShopSuccessPurchaseEvent se = new ShopSuccessPurchaseEvent(shop, p, amount, total, taxModifier); @@ -839,7 +839,7 @@ public class ShopManager { msg += "\n" + MsgUtil.getMessage("shop-out-of-stock", p, Integer.toString(shop.getLocation().getBlockX()), Integer.toString(shop.getLocation().getBlockY()), Integer.toString(shop.getLocation().getBlockZ()), Util.getItemStackName(shop.getItem())); } - MsgUtil.send(shop.getOwner(), msg, shop.isUnlimited()); + MsgUtil.send(shop, shop.getOwner(), msg); shop.sell(p, amount); MsgUtil.sendPurchaseSuccess(p, shop, amount); ShopSuccessPurchaseEvent se = new ShopSuccessPurchaseEvent(shop, p, amount, total, taxModifier); diff --git a/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java b/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java index ffad7ce42..77485eee9 100644 --- a/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java +++ b/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java @@ -71,7 +71,7 @@ import java.util.logging.Level; public class MsgUtil { private static final String invaildMsg = "Invaild message"; - private static final Map> player_messages = Maps.newConcurrentMap(); + private static final Map> outGoingPlayerMessages = Maps.newConcurrentMap(); private static final QuickShop plugin = QuickShop.getInstance(); @@ -111,21 +111,24 @@ public class MsgUtil { Player player = p.getPlayer(); if (player != null) { UUID pName = p.getUniqueId(); - LinkedList msgs = player_messages.get(pName); + LinkedList msgs = outGoingPlayerMessages.get(pName); if (msgs != null) { for (String msg : msgs) { if (p.getPlayer() != null) { Util.debugLog("Accepted the msg for player " + p.getName() + " : " + msg); String[] msgData = msg.split("##########"); - try { - ItemStack data = Util.deserialize(msgData[1]); - if (data == null) { - throw new InvalidConfigurationException(); + if (msgData.length == 3) { + try { + ItemStack data = Util.deserialize(msgData[1]); + if (data == null) { + MsgUtil.sendMessage(p.getPlayer(), msg); + } else { + sendItemholochat(player, msgData[0], data, msgData[2]); + } + } catch (InvalidConfigurationException e) { + MsgUtil.sendMessage(p.getPlayer(), msg); } - sendItemholochat(player, msgData[0], data, msgData[2]); - } catch (InvalidConfigurationException e) { - MsgUtil.sendMessage(p.getPlayer(), msgData[0] + msgData[1] + msgData[2]); - } catch (ArrayIndexOutOfBoundsException e2) { + } else { MsgUtil.sendMessage(p.getPlayer(), msg); } } @@ -148,8 +151,9 @@ public class MsgUtil { if (json == null) { return; } + Util.debugLog(left); - Util.debugLog(itemStack.toString()); + Util.debugLog(json); Util.debugLog(right); TextComponent centerItem = new TextComponent(left + Util.getItemStackName(itemStack) + right); ComponentBuilder cBuilder = new ComponentBuilder(json); @@ -195,7 +199,7 @@ public class MsgUtil { } String filled = fillArgs(raw.get(), args); if (player != null) { - if (plugin.getPlaceHolderAPI() != null && plugin.getPlaceHolderAPI().isEnabled() && plugin.getConfig().getBoolean("plugin.PlaceHolderAPI")) { + if (plugin.getConfig().getBoolean("plugin.PlaceHolderAPI") && plugin.getPlaceHolderAPI() != null && plugin.getPlaceHolderAPI().isEnabled()) { filled = PlaceholderAPI.setPlaceholders(player, filled); Util.debugLog("Processed message " + filled + " by PlaceHolderAPI."); } @@ -446,7 +450,7 @@ public class MsgUtil { * loads all player purchase messages from the database. */ public static void loadTransactionMessages() { - player_messages.clear(); // Delete old messages + outGoingPlayerMessages.clear(); // Delete old messages try { ResultSet rs = plugin.getDatabaseHelper().selectAllMessages(); while (rs.next()) { @@ -460,7 +464,7 @@ public class MsgUtil { } String message = rs.getString("message"); LinkedList msgs = - player_messages.computeIfAbsent(ownerUUID, k -> new LinkedList<>()); + outGoingPlayerMessages.computeIfAbsent(ownerUUID, k -> new LinkedList<>()); msgs.add(message); } } catch (SQLException e) { @@ -476,41 +480,76 @@ public class MsgUtil { * @param message The message to send them Sends the given player a message if they're online. * Else, if they're not online, queues it for them in the database. * @param isUnlimited The shop is or unlimited + * + * Deprecated for always use for bukkit deserialize method (costing ~145ms) */ + @Deprecated public static void send(@NotNull UUID player, @NotNull String message, boolean isUnlimited) { - if (plugin.getConfig().getBoolean("shop.ignore-unlimited-shop-messages") && isUnlimited) { + if (isUnlimited && plugin.getConfig().getBoolean("shop.ignore-unlimited-shop-messages")) { return; // Ignore unlimited shops messages. } Util.debugLog(message); String[] msgData = message.split("##########"); OfflinePlayer p = Bukkit.getOfflinePlayer(player); if (!p.isOnline()) { - LinkedList msgs = player_messages.get(player); - if (msgs == null) { - msgs = new LinkedList<>(); - } - player_messages.put(player, msgs); + LinkedList msgs = outGoingPlayerMessages.getOrDefault(player, new LinkedList<>()); msgs.add(message); + outGoingPlayerMessages.put(player, msgs); plugin.getDatabaseHelper().sendMessage(player, message, System.currentTimeMillis()); } else { if (p.getPlayer() != null) { - try { - sendItemholochat(p.getPlayer(), msgData[0], Objects.requireNonNull(Util.deserialize(msgData[1])), msgData[2]); - } catch (InvalidConfigurationException e) { - Util.debugLog("Unknown error, send by plain text."); - MsgUtil.sendMessage(p.getPlayer(), msgData[0] + msgData[1] + msgData[2]); - } catch (ArrayIndexOutOfBoundsException e2) { + if (msgData.length == 3) { try { - sendItemholochat(p.getPlayer(), msgData[0], Objects.requireNonNull(Util.deserialize(msgData[1])), ""); + sendItemholochat(p.getPlayer(), msgData[0], Objects.requireNonNull(Util.deserialize(msgData[1])), msgData[2]); } catch (Exception any) { + Util.debugLog("Unknown error, send by plain text."); // Normal msg MsgUtil.sendMessage(p.getPlayer(), message); } + } else { + // Normal msg + MsgUtil.sendMessage(p.getPlayer(), message); } } } } + /** + * @param shop The shop purchased + * @param player The name of the player to message + * @param message The message to send, if the given player are online it will be send immediately, + * Else, if they're not online, queues them in the database. + */ + public static void send(@NotNull Shop shop, @NotNull UUID player, @NotNull String message) { + if (shop.isUnlimited() && plugin.getConfig().getBoolean("shop.ignore-unlimited-shop-messages")) { + return; // Ignore unlimited shops messages. + } + Util.debugLog(message); + String[] msgData = message.split("##########"); + OfflinePlayer p = Bukkit.getOfflinePlayer(player); + if (!p.isOnline()) { + LinkedList msgs = outGoingPlayerMessages.getOrDefault(player, new LinkedList<>()); + msgs.add(message); + outGoingPlayerMessages.put(player, msgs); + plugin.getDatabaseHelper().sendMessage(player, message, System.currentTimeMillis()); + } else { + if (p.getPlayer() != null) { + if (msgData.length == 3) { + try { + sendItemholochat(p.getPlayer(), msgData[0], shop.getItem(), msgData[2]); + } catch (Exception any) { + Util.debugLog("Unknown error, send by plain text."); + // Normal msg + MsgUtil.sendMessage(p.getPlayer(), message); + } + } else { + // Normal msg + MsgUtil.sendMessage(p.getPlayer(), message); + } + } + } + } + public static @NotNull String getSubString( @NotNull String text, @NotNull String left, @NotNull String right) { String result; @@ -871,9 +910,7 @@ public class MsgUtil { } if (!enchs.isEmpty()) { chatSheetPrinter.printCenterLine(MsgUtil.getMessage("menu.enchants", p)); - for (Entry entries : enchs.entrySet()) { - chatSheetPrinter.printLine(ChatColor.YELLOW + MsgUtil.getEnchi18n(entries.getKey()) + " " + RomanNumber.toRoman(entries.getValue())); - } + printEnchantment(chatSheetPrinter, enchs); } if (shop.getItem().getItemMeta() instanceof EnchantmentStorageMeta) { EnchantmentStorageMeta stor = (EnchantmentStorageMeta) shop.getItem().getItemMeta(); @@ -881,13 +918,21 @@ public class MsgUtil { enchs = stor.getStoredEnchants(); if (!enchs.isEmpty()) { chatSheetPrinter.printCenterLine(MsgUtil.getMessage("menu.stored-enchants", p)); - for (Entry entries : enchs.entrySet()) { - chatSheetPrinter.printLine(ChatColor.YELLOW + MsgUtil.getEnchi18n(entries.getKey()) + " " + RomanNumber.toRoman(entries.getValue())); - } + printEnchantment(chatSheetPrinter, enchs); } } } + private static void printEnchantment(ChatSheetPrinter chatSheetPrinter, Map enchs) { + for (Entry entries : enchs.entrySet()) { + Integer level = entries.getValue(); + if (level == null) { + level = 1; + } + chatSheetPrinter.printLine(ChatColor.YELLOW + MsgUtil.getEnchi18n(entries.getKey()) + " " + RomanNumber.toRoman(level)); + } + } + /** * Send a shop infomation to a player. * diff --git a/src/main/java/org/maxgamer/quickshop/util/Util.java b/src/main/java/org/maxgamer/quickshop/util/Util.java index 0be13524e..ce52f951c 100644 --- a/src/main/java/org/maxgamer/quickshop/util/Util.java +++ b/src/main/java/org/maxgamer/quickshop/util/Util.java @@ -289,9 +289,7 @@ public class Util { yamlConfiguration.loadFromString(config); return yamlConfiguration.getItemStack("item"); } catch (Exception e) { - e.printStackTrace(); - yamlConfiguration.loadFromString(config); - return yamlConfiguration.getItemStack("item"); + throw new InvalidConfigurationException("Exception in deserialize item", e); } } @@ -324,7 +322,7 @@ public class Util { lock.writeLock().unlock(); return; } - final StackTraceElement stackTraceElement = new Throwable().getStackTrace()[1]; + final StackTraceElement stackTraceElement = Thread.currentThread().getStackTrace()[1]; final String className = stackTraceElement.getClassName(); final String methodName = stackTraceElement.getMethodName(); final int codeLine = stackTraceElement.getLineNumber(); @@ -728,7 +726,7 @@ public class Util { } worldBlacklist = plugin.getConfig().getStringList("shop.blacklist-world"); - disableDebugLogger = plugin.getConfig().getBoolean("disable-debuglogger", false); + disableDebugLogger = plugin.getConfig().getBoolean("debug.disable-debuglogger", false); currencySymbolOnRight = plugin.getConfig().getBoolean("shop.currency-symbol-on-right", false); alternateCurrencySymbol = plugin.getConfig().getString("shop.alternate-currency-symbol", "$"); @@ -1337,6 +1335,7 @@ public class Util { return cfg.saveToString(); } + /** * Return the Class name. * diff --git a/src/main/java/org/maxgamer/quickshop/util/compatibility/SpartanCompatibilityModule.java b/src/main/java/org/maxgamer/quickshop/util/compatibility/SpartanCompatibilityModule.java new file mode 100644 index 000000000..64de72707 --- /dev/null +++ b/src/main/java/org/maxgamer/quickshop/util/compatibility/SpartanCompatibilityModule.java @@ -0,0 +1,42 @@ +package org.maxgamer.quickshop.util.compatibility; + + +import lombok.AllArgsConstructor; +import me.vagdedes.spartan.api.API; +import me.vagdedes.spartan.system.Enums; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.jetbrains.annotations.NotNull; +import org.maxgamer.quickshop.QuickShop; +import org.maxgamer.quickshop.util.Util; + +@AllArgsConstructor +public class SpartanCompatibilityModule implements CompatibilityModule { + private final QuickShop plugin; + + @Override + public @NotNull String getName() { + return "Spartan"; + } + + @Override + public @NotNull Plugin getPlugin() { + return plugin; + } + + @Override + public void toggle(@NotNull Player player, boolean checking) { + if (checking) { + Util.debugLog( + "Calling Spartan ignore " + + player.getName() + + " cheats detection until we finished permission checks."); + + API.startCheck(player, Enums.HackType.Nuker); + } else { + Util.debugLog( + "Calling Spartan continue follow " + player.getName() + " cheats detection."); + API.stopCheck(player, Enums.HackType.Nuker); + } + } +} diff --git a/src/main/java/org/maxgamer/quickshop/watcher/LogWatcher.java b/src/main/java/org/maxgamer/quickshop/watcher/LogWatcher.java index 6a33d861e..f9a6cf69e 100644 --- a/src/main/java/org/maxgamer/quickshop/watcher/LogWatcher.java +++ b/src/main/java/org/maxgamer/quickshop/watcher/LogWatcher.java @@ -28,15 +28,17 @@ import org.maxgamer.quickshop.QuickShop; import org.maxgamer.quickshop.util.Util; import java.io.*; -import java.sql.Timestamp; -import java.util.Calendar; -import java.util.Date; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; public class LogWatcher extends BukkitRunnable { private final Queue logs = new ConcurrentLinkedQueue<>(); + private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS").withZone(ZoneId.systemDefault()); private FileWriter logFileWriter = null; private PrintWriter pw; @@ -68,9 +70,7 @@ public class LogWatcher extends BukkitRunnable { } public void log(@NonNull String log) { - Date date = Calendar.getInstance().getTime(); - Timestamp time = new Timestamp(date.getTime()); - this.add("[" + time + "] " + log); + this.add("[" + dateTimeFormatter.format(Instant.now()) + "] " + log); } public void add(@NotNull String s) { diff --git a/src/main/java/org/maxgamer/quickshop/watcher/OngoingFeeWatcher.java b/src/main/java/org/maxgamer/quickshop/watcher/OngoingFeeWatcher.java index 108c3bb8f..0d163877c 100644 --- a/src/main/java/org/maxgamer/quickshop/watcher/OngoingFeeWatcher.java +++ b/src/main/java/org/maxgamer/quickshop/watcher/OngoingFeeWatcher.java @@ -86,6 +86,7 @@ public class OngoingFeeWatcher extends BukkitRunnable { public void removeShop(@NotNull Shop shop) { Bukkit.getScheduler().runTask(plugin, (@NotNull Runnable) shop::delete); MsgUtil.send( + shop, shop.getOwner(), MsgUtil.getMessageOfflinePlayer( "shop-removed-cause-ongoing-fee", @@ -97,8 +98,7 @@ public class OngoingFeeWatcher extends BukkitRunnable { + " Y:" + shop.getLocation().getBlockY() + " Z:" - + shop.getLocation().getBlockZ()), - shop.isUnlimited()); + + shop.getLocation().getBlockZ())); } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 272bb99b4..03b51d76a 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,7 +1,7 @@ #This is example config, don't direct modify this file, all changes will revert when you reload the plugin. #Do not touch if you not clear know about this -config-version: 111 +config-version: 112 #Select the language you want to use, (e.g de), use only supported language codes from the list below. #If you use a not exist/not support language, plugin will move to use en_US to keep everything working. @@ -61,8 +61,19 @@ show-tax: false #Whether to respect item flag (e.g. hide the enchantment info when item have HIDE_ENCHANTS flag) respect-item-flag: true -#Should we log transactions/creations to Bukkit\Plugins\QuickShop\qs.log? -log-actions: true +logging: + #Enable logging? + enable: true + #Should we log shop trade/creations to Plugins\QuickShop\qs.log? + log-actions: true + #Should we log balance before and after in shop trade to Plugins\QuickShop\qs.log? + log-balance: true + #The target size to split large files (MB) to Plugins\QuickShop\logs folder + #WIP + file-size: 10 +#Some eco plugin will caching player balance, sometime will cause insufficient balance +#This workaround using getBalance to refresh it, but is time +trying-fix-banlance-insuffient: false #For item-item based economies that don't use virtual coins. whole-number-prices-only: false @@ -583,6 +594,10 @@ protect: custom-item-stacksize: [] debug: + #Should we disable debug logger? + #It will save lots of execution time but lack information when reporting bugs and asking support + disable-debuglogger: false + #logging stacktrace when deleting shop shop-deletion: false diff --git a/src/main/resources/lang/de-DE/messages.json b/src/main/resources/lang/de-DE/messages.json index d6d746c1f..6fcdf9235 100644 --- a/src/main/resources/lang/de-DE/messages.json +++ b/src/main/resources/lang/de-DE/messages.json @@ -120,7 +120,7 @@ "now-selling": "&e{0} &awerden jetzt &dVERKAUFT", "cleaning": "&aEntferne Shops ohne Lager...", "reloading": "&aWird neu geladen...", - "cleaned": "&e{0}&a Shops wurden entfernt.", + "cleaned": "&aEntfernte &e{0}&ein Shop.", "no-type-given": "&cVerwendung: /qs find ", "bulk-size-not-set": "&cVerwendung: /qs size ", "bulk-size-now": "&aHandle jetzt {0}x {1}", diff --git a/src/main/resources/lang/fi-FI/messages.json b/src/main/resources/lang/fi-FI/messages.json index fea94fc1e..3267d03d5 100644 --- a/src/main/resources/lang/fi-FI/messages.json +++ b/src/main/resources/lang/fi-FI/messages.json @@ -111,9 +111,9 @@ "unlimited": "&aKaupassa on nyt rajattomasti tavaroita", "limited": "&aKauppa ei ole enään rajaton" }, - "transfer-success": "&aTransferred &e{0} &ashop(s) to &e{1}", - "transfer-success-other": "&aTransferred &e{0} {1}&a's shop(s) to &e{2}", - "some-shops-removed": "&e{0} &ashop(s) removed", + "transfer-success": "&aSiirretty &e{0} &akauppa(a) &e{1}:lle", + "transfer-success-other": "&aSiirretty &e{0} {1}&a:n kauppa(a) &e{2}:lle", + "some-shops-removed": "&e{0} &akauppa(a) poistettu", "no-owner-given": "&cEi omistajaa annettu", "new-owner": "&aUusi omistaja: &e{0}", "now-buying": "&aNyt &dOSTETAAN &e{0}", @@ -159,7 +159,7 @@ "supercreate": "&eLuo kauppa ohittamalla kaikki suojaustarkistukset", "language": "&eVaihda tällä hetkellä käytettyä kieltä", "removeall": "&ePoista KAIKKI kaupat kyseiseltä pelaajalta", - "transfer": "&eTransfer someone's ALL shops to other" + "transfer": "&eSiirrä jonkun KAIKKI kaupat toiselle" } }, "signs": { diff --git a/src/main/resources/lang/ja-JP/messages.json b/src/main/resources/lang/ja-JP/messages.json index 082745a5d..c78ac824c 100644 --- a/src/main/resources/lang/ja-JP/messages.json +++ b/src/main/resources/lang/ja-JP/messages.json @@ -1,88 +1,88 @@ { - "translation-author": "Translator: Ghost_chu, Andre_601", - "translation-version": "サポートバージョン: Reremake", - "translation-contributors": "Contributors: Timtower, Netherfoam, KaiNoMood, Mgazul, JackTheChicken and Andre_601", - "translation-country": "言語圏: 日本語 (ja_JP)", + "translation-author": "翻訳者: Ghost_chu, Andre_601", + "translation-version": "&c&lサポートバージョン: &b&lReremake", + "translation-contributors": "貢献者: Timtower, Netherfoam, KaiNoMood, Mgazul, JackTheChicken and Andre_601", + "translation-country": "&c&l言語圏: &b&l日本語 (ja_JP)", "language-version": "41", - "not-looking-at-shop": "&cCould not find a QuickShop. You need to look at one.", - "no-anythings-in-your-hand": "&cThere is nothing in your hand.", + "not-looking-at-shop": "&cQuickShopが見つかりませんでした。確認する必要があります。", + "no-anythings-in-your-hand": "&cあなたの手には何もありません。", "no-permission": "&c権限を持っていないため実行できません。", - "integrations-check-failed-create": "&cIntegration {0} denied the shop-creation", - "integrations-check-failed-trade": "&cIntegration {0} denied the Shop trading", - "3rd-plugin-build-check-failed": "&c3rd party plugin &l{0}&r&c denied the permission checks, did you have permission setup in there?", - "no-creative-break": "&cYou cannot break other players shops in creative mode, switch to survival mode or try to use the supertool {0} instead.", - "trading-in-creative-mode-is-disabled": "&cYou cannot trade with this shop while being in creative mode.", - "supertool-is-disabled": "&cSupertool is disabled. Cannot break any shops.", - "no-double-chests": "&cYou cannot create the double chest shop.", - "not-managed-shop": "&cYou are not the owner or moderator of this Shop", - "shop-already-owned": "&cThis is already a shop.", + "integrations-check-failed-create": "&c統合 {0} がショップの作成を拒否しました", + "integrations-check-failed-trade": "&c統合 {0} がショップの作成を拒否しました", + "3rd-plugin-build-check-failed": "一部のサードパーティプラグインが権限チェックを拒否しました。権限が組み込まれていますか?", + "no-creative-break": "&cクリエイティブモードで他のショップを壊すことはできません。サバイバルモードに切り替えるか、代わりにスーパーツール {0} を使用してください。", + "trading-in-creative-mode-is-disabled": "&cクリエイティブモードではこのショップと取引することはできません。", + "supertool-is-disabled": "&cスーパーツールが無効になっています。ショップを破壊できません。", + "no-double-chests": "&cダブルチェストショップを作成することはできません。", + "not-managed-shop": "あなたはショップの所有者でもモデレーターでもありません。", + "shop-already-owned": "&cすでにショップです。", "chest-was-removed": "&cチェストが削除されました。", "price-too-cheap": "&c価格は&e${0}&c以上である必要があります。", - "no-price-change": "&cThis wouldn't result in a price change!", + "no-price-change": "&c価格変更できません!", "you-cant-afford-a-new-shop": "&c新しいショップを作成するには{0}かかります。", - "player-bought-from-your-store-tax": "&c{0} purchased {1} {2} from your shop, and you paid {3} in taxes.", + "player-bought-from-your-store-tax": "&c{0} は {1} {2} をショップから購入し {3} を税で支払いました。", "you-cant-afford-to-change-price": "&cショップで価格を変更するには {0} かかります。", - "success-created-shop": "&cShop created.", + "success-created-shop": "&cショップが作成されました。", "success-removed-shop": "&aショップを削除しました。", - "shops-arent-locked": "&cRemember, shops are NOT protected from theft! If you want to stop thieves, lock it with LWC, Lockette, etc!", - "shop-creation-cancelled": "&cShop creation cancelled.", - "shop-purchase-cancelled": "&cShop purchase cancelled.", - "shop-stock-too-low": "&cThe shop only has {0} {1} left!", - "you-cant-afford-to-buy": "&cIt costs {0}, but you only have {1}", - "negative-amount": "&cYou can't trade negative amounts", - "not-a-number": "&cYou can only input a number, your input was {0}.", - "not-a-integer": "&cYou must input a number, your input was {0}.", - "player-bought-from-your-store": "&c{0} purchased {1} {2} from your shop.", - "shop-out-of-stock": "&5Your shop at {0}, {1}, {2} has run out of {3}!", + "shops-arent-locked": "&cショップは保護されていません!保護が必要な場合は、LWCやLocketteなどでロックしてください!", + "shop-creation-cancelled": "&cショップの作成がキャンセルされました。", + "shop-purchase-cancelled": "&cショップ購入がキャンセルされました。", + "shop-stock-too-low": "&cショップには {0} {1} しか残っていません!", + "you-cant-afford-to-buy": "&c費用は {0} ですが、{1} しかありません。", + "negative-amount": "&cマイナス量を取引できません", + "not-a-number": "&c入力できるのは,あなたの入力は {0} でした.", + "not-a-integer": "&c入力できるのは,あなたの入力は {0} でした.", + "player-bought-from-your-store": "&c{0} はショップから {1} {2} を購入しました。", + "shop-out-of-stock": "&5{0}、{1}、{2} のショップで {3} がなくなりました!", "shop-has-no-space": "&cショップには {0} 個以上 {1} 個分のスペースしかありません", "you-dont-have-that-many-items": "&c{0} {1} しかありません", - "the-owner-cant-afford-to-buy-from-you": "&cThis costs {0}, but the shop-owner only has {1}", - "player-sold-to-your-store": "&a{0} sold {1} {2} to your shop.", - "shop-out-of-space": "&5Your shop at {0}, {1}, {2} is now full.", - "fee-charged-for-price-change": "&aYou paid &c{0}&a to change the price.", - "price-is-now": "&aThe new price of the shop is &e{0}", + "the-owner-cant-afford-to-buy-from-you": "&c{0} 必要ですが {1} しかありません", + "player-sold-to-your-store": "&a{0} があなたのショップに {1} {2} を販売しました", + "shop-out-of-space": "&5{0}, {1}, {2} のショップは一杯です", + "fee-charged-for-price-change": "&a価格変更のため &c{0}&a を支払いました", + "price-is-now": "&aショップの新しい価格は &e{0} です", "thats-not-a-number": "&c無効な番号です", "no-price-given": "&c有効な価格を設定してください", - "average-price-nearby": "&aNearby average price: &e{0}", - "shop-has-changed": "&cThe shop you tried to use has changed since you clicked it!", - "shop-not-exist": "&cThere is no shop.", + "average-price-nearby": "&a近くの平均価格: &e{0}", + "shop-has-changed": "&cクリックしたので使おうとしたショップが変わりました", + "shop-not-exist": "&cショップがありませんでした", "nearby-shop-this-way": "&aショップは {0} ブロック離れています", - "no-nearby-shop": "&cNo nearby shop matching {0}.", - "buying-more-than-selling": "&cWARNING: You are buying items for more than you are selling them!", - "not-enough-space": "&cYou only have room for {0} more!", - "refill-success": "&aRefill successful", - "empty-success": "&aEmptying shop successful", + "no-nearby-shop": "&c {0} に一致する近くのショップはありません。", + "buying-more-than-selling": "&c警告: 売っているアイテムよりも多くを買っています", + "not-enough-space": "&cショップには {0} 個以上 個分のスペースしかありません", + "refill-success": "&aRefill 成功", + "empty-success": "&aショップを空にしました", "admin-shop": "アドミンショップ", "unknown-owner": "不明", - "owner-bypass-check": "&eBypassed all checks. Trade successful! (You are now the shop owner!)", - "reached-maximum-can-create": "&cYou already created a maximum of {0}/{1} shops!", - "restricted-prices": "&cRestricted price for {0}: Min {1}, max {2}", - "no-enough-money-to-keep-shops": "&cYou didn't have enough money to keep your shops! All shops have been removed...", - "nothing-to-flush": "&aYou have no new shop messages.", + "owner-bypass-check": "&e全てのチェックをバイパス、取引成功(あなたはショップオーナーです)", + "reached-maximum-can-create": "&cすでに最大 {0} / {1} のショップを作成しました", + "restricted-prices": "&c{0} の制限価格 : 最小 {1} , 最大 {2}", + "no-enough-money-to-keep-shops": "&cショップを維持するのに十分な資金がありませんので全てのショップが削除されました", + "nothing-to-flush": "&a新しいショップメッセージはありませんでした", "break-shop-use-supertool": "&eSuperTool を使ってショップを壊す事ができます", - "failed-to-put-sign": "&cNot enough space around the shop to place the info sign.", - "failed-to-paste": "&cFailed to upload the data to Pastebin. Check your internet connection and try again. (See console for details)", - "warn-to-paste": "&eCollecting data and uploading it to Pastebin, this may take a while. &c&lWarning:&c The data is kept public for one week! It may leak your server configuration and other sensitive information. Make sure you only send it to <rusted staff/developers.", - "price-too-high": "&cThe shop price is too high! You cannot create one with a price higher than {0}.", + "failed-to-put-sign": "&cショップの周りに情報看板を配置するのに十分なスペースがありません。", + "failed-to-paste": "&cPastebin へのデータのアップロードに失敗しました。インターネットを確認して、もう一度お試しください。(詳細についてはコンソールをご覧ください)", + "warn-to-paste": "&eデータを収集してPastebinにアップロードするには、しばらく時間がかかる場合があります。&c&l警告&c、データは1週間公開されます。サーバー設定やその他の機密情報が漏洩する可能性があります。&l信頼できるスタッフ/開発者にのみ送信するようにしてください。", + "price-too-high": "&cショップの価格が高すぎます! {0} より高い価格のショップは作成できません。", "you-cant-create-shop-in-there": "&cこの場所にショップを作成する権限がありません。", - "unknown-player": "&cTarget player doesn't exist, please check the username you typed.", - "shop-staff-cleared": "&aSuccessfully removed all staff members from your shop.", - "shop-staff-added": "&aSuccessfully added {0} as a staff member for your shop.", - "shop-staff-deleted": "&aSuccessfully removed {0} as a staff member for your shop.", - "no-permission-build": "&cYou cannot build a shop here.", - "success-change-owner-to-server": "&aSuccessfully set the shop owner to Server.", + "unknown-player": "&c目的のプレーヤーが存在しません。入力したユーザー名を確認してください。", + "shop-staff-cleared": "&aショップの全てのスタッフを削除しました。", + "shop-staff-added": "&aショップの全てのスタッフを削除しました。", + "shop-staff-deleted": "&aショップの全てのスタッフを削除しました。", + "no-permission-build": "&cここではショップを作成できません。", + "success-change-owner-to-server": "&aショップの所有者をサーバーに設定しました。", "flush-finished": "&a未読メッセージの取り出しに成功しました", - "purchase-failed": "&cPurchase failed: Internal Error. Please contact the Server Administrator.", - "no-pending-action": "&cYou do not have any pending actions", - "permission-denied-3rd-party": "&cPermission denied: 3rd Party Plugin [{0}].", + "purchase-failed": "&c購入に失敗しました:内部エラー。サーバー管理者に連絡してください。", + "no-pending-action": "&c保留中のアクションはありません", + "permission-denied-3rd-party": "&cアクセス拒否: サードパーティのプラグイン [{0}]", "menu": { - "successful-purchase": "&aSuccessfully purchased:", - "successfully-sold": "&aSuccessfully sold:", + "successful-purchase": "&a購入に成功しました:", + "successfully-sold": "&a売却に成功しました:", "item-name-and-price": "&e{0} {1} &aを &e{2}", "sell-tax": "&a税として &e{0} &aを支払いました", - "sell-tax-self": "&aYou didn't pay taxes because you own this shop.", - "enchants": "&5Enchantments", - "stored-enchants": "&5Stored Enchantments", + "sell-tax-self": "&aこのショップを所有しているため、税金を支払っていません。", + "enchants": "&5エンチャント", + "stored-enchants": "&5エンチャント保管", "shop-information": "&aショップ情報 :", "owner": "&a所有者 : {0}", "item": "&aアイテム : &e{0}", @@ -91,70 +91,70 @@ "space": "&a空き : &e{0}", "stock": "&a在庫 : &e{0}", "price-per": "&a単価 : &e{0} &a- &e{1}", - "price-per-stack": "&aPrice per &e{2}x {0} - {1}", - "total-value-of-chest": "&aTotal value of chest: &e{0}", - "damage-percent-remaining": "&e{0}% &aremaining.", + "price-per-stack": "&a単価: &e{0} &a- &e{1}", + "total-value-of-chest": "&aチェストの合計額: &e{0}", + "damage-percent-remaining": "&a残り &e{0}%", "this-shop-is-buying": "&aこのショップは &d販売&a です", "this-shop-is-selling": "&aこのショップは &b買取&a です", - "shop-stack": "&aAmount of bulk: &e{0}", + "shop-stack": "&a一括処理量: &e{0}", "effects": "&a効果" }, - "bypassing-lock": "&cBypassing a QuickShop lock!", - "that-is-locked": "&cThis shop is locked.", - "how-many-buy": "&aEnter in chat, how many you wish to &bBUY&a. You can buy &e{0}&a. Enter &ball&a to buy them all.", - "how-many-sell": "&aEnter in chat, how much you wish to &dSELL&a. You have &e{0}&a available. Enter &ball&a in chat, to sell all.", + "bypassing-lock": "&cQuickShopロックをバイパスします!", + "that-is-locked": "&cショップはロックされています。", + "how-many-buy": "&aチャットで&b購入&aしたい数を入力してください。&e{0}&aを購入できます。&ball&aで全て購入", + "how-many-sell": "&aチャットで&d販売&aしたい数を入力してください。&e{0}&a持っています。&ball&aで全て販売", "not-allowed-to-create": "&cあなたはここでショップを作る事ができません", - "blacklisted-item": "&cYou cannot sell this item because it is on the blacklist", - "how-much-to-trade-for": "&aEnter in chat, how much you wish to trade &e{1}x {0}&a for.", + "blacklisted-item": "&cブラックリストにあるため、この商品を販売することはできません", + "how-much-to-trade-for": "&aチャットに参加して&e{1}x {0}&aをどの程度トレードしたいかを入力してください。", "command": { "toggle-unlimited": { "unlimited": "&aショップは無制限になりました", "limited": "&aショップは制限されています" }, - "transfer-success": "&aTransferred &e{0} &ashop(s) to &e{1}", - "transfer-success-other": "&aTransferred &e{0} {1}&a's shop(s) to &e{2}", - "some-shops-removed": "&e{0} &ashop(s) removed", - "no-owner-given": "&cNo owner provided", + "transfer-success": "&a&e{0} &ashop(s) &e{1} に転送しました", + "transfer-success-other": "&a{0} {1}&aのショップを&e{2} に転送しました", + "some-shops-removed": "&e{0} &ashop(s) 削除", + "no-owner-given": "&c所有者が指定されていません", "new-owner": "&a新しい所有者 : &e{0}", - "now-buying": "&aNow &dBUYING &e{0}", + "now-buying": "&a現在 &d買取 &e{0}", "now-selling": "&a現在 &b販売 &e{0}", - "cleaning": "&aRemoving shops without any stock...", + "cleaning": "&a在庫のないショップを削除しています...", "reloading": "&aリロード中...", - "cleaned": "&aRemoved &e{0}&a shops.", + "cleaned": "&e{0}&a ショップを削除しました。", "no-type-given": "&c使用法: /qs find <アイテム名>", - "bulk-size-not-set": "&cUsage: /qs size ", - "bulk-size-now": "&aNow trading &e{0}x {1}", - "invalid-bulk-amount": "&cThe given value {0} is larger than max stack size or lower than one", - "no-trade-item": "&aPlease hold a trade item to change in main hand", - "trade-item-now": "&aNow trading &e{0}x {1}", - "no-amount-given": "&cNo amount provided. Use &a/qs refill &c", - "now-debuging": "&aSuccessfully enabled developer mode. Reloading QuickShop...", - "now-nolonger-debuging": "&aSuccessfully disabled Developer mode. Reloading QuickShop...", - "wrong-args": "&cInvalid arguments. Use &l/qs help &rto preview the list of commands.", + "bulk-size-not-set": "&c使用法: /qs サイズ ", + "bulk-size-now": "&a取引中 &e{0}x {1}", + "invalid-bulk-amount": "&c与えられた値 {0} は最大スタックサイズ以下です。", + "no-trade-item": "&aメインハンドで変更するトレードアイテムを保持してください", + "trade-item-now": "&a取引中 &e{0}x {1}", + "no-amount-given": "&c金額がありません。&a/qs refill &c を使用してください", + "now-debuging": "&a開発者モードに切り替え成功、QuickShopをリロードしています。", + "now-nolonger-debuging": "&a開発者モードに切り替え成功、QuickShopをリロードしています。", + "wrong-args": "&c無効な引数。&l/qs help &rto preview the list of commands.", "description": { - "title": "&aQuickShop help", - "unlimited": "&eGives a shop unlimited stock.", - "setowner": "&eChanges the ownership of a shop.", - "owner": "&eChanges the ownership of a shop.", - "buy": "&eChanges a shop to &dBUY&e mode", - "sell": "&eChanges a shop to &bSELL&e mode", - "price": "&eChanges the buy/sell price of a shop", - "clean": "&eRemoves all (loaded) shops without any stock", + "title": "&aQuickShop ヘルプ", + "unlimited": "&eショップに無制限の在庫を与えます", + "setowner": "&eショップの所有権を変更する", + "owner": "&eショップの所有権を変更する", + "buy": "&eショップを&d買取&eモードに変更します", + "sell": "&eショップを&b販売&eモードに変更します", + "price": "&eいずれかのショップの購入/販売価格を変更します", + "clean": "&e在庫のないすべての(読み込まれた) ショップを削除します", "find": "&e指定アイテムの最寄りショップを探します", - "reload": "&eReloads the config.yml of QuickShop", + "reload": "&econfig.yml をリロードします", "refill": "&e特定数のアイテムをショップに追加します", - "empty": "&eRemoves all items from a shop", - "debug": "&eEnables Developer mode", - "create": "&eCreates a new shop from the targeted chest", - "fetchmessage": "&eShow unread shop messages", - "info": "&eShow QuickShop statistics", - "paste": "&eUploads server data to Pastebin", - "staff": "&eManage your shop staff", - "remove": "&eRemoves the shop you're looking at", - "amount": "&eTo set item amount (Useful when having chat issues)", - "about": "&eShows QuickShop info", - "help": "&eShows QuickShop help", - "item": "&eChange shop item of a shop", + "empty": "&eショップから全ての在庫を削除します", + "debug": "開発者モードの有効化", + "create": "&eターゲットしたチェストに新しいショップを作成します", + "fetchmessage": "&e未読ショップメッセージを取得", + "info": "&eQuickShop 統計を表示します", + "paste": "&eサーバーデータを Pastebin に自動アップロードします", + "staff": "&eショップスタッフを管理する", + "remove": "&eあなたが見ているショップを削除します", + "amount": "&eアイテム数を設定する(チャットの問題がある場合に便利)", + "about": "&eQuickShopのヘルプを表示", + "help": "&eQuickShopのヘルプを表示", + "item": "&eショップのショップアイテムを変更する", "size": "&eChange per bulk amount of a shop", "supercreate": "&eCreate a shop while bypassing all protection checks", "language": "&eChange the currently used language", @@ -260,22 +260,22 @@ "name": "言語: ", "code": "コード: ", "progress": "Progress: ", - "help": "Help us: ", + "help": "ヘルプ: ", "translate-on-crowdin": "[Crowdinで翻訳]" }, - "shop-now-freezed": "&aYou have frozen the shop. Nobody can trade with this shop now!", - "shop-nolonger-freezed": "&aYou unfroze the shop. It's back to normal now!", - "shop-cannot-trade-when-freezing": "&cYou cannot trade with this shop because it is frozen.", - "shop-freezed-at-location": "&eYour shop {0} at {1} got frozen!", - "denied-put-in-item": "&cYou cannot put this item into your shop!", + "shop-now-freezed": "&aショップを凍結しました。誰もこのショップと取引できません!", + "shop-nolonger-freezed": "&aショップを凍結解除しました。通常の状態に戻ります!", + "shop-cannot-trade-when-freezing": "&c凍結されているため、このショップと取引できません。", + "shop-freezed-at-location": "&e {0} のショップ {1} が凍結されました!", + "denied-put-in-item": "&cショップにこのアイテムを入れることはできません!", "how-many-buy-stack": "&eEnter in chat, how many bulks you wish to &bBUY&a. There are &e{0}&a items in each bulk and you can buy &e{1}&a bulks. Enter &ball&a in chat to buy all.", "how-many-sell-stack": "&aEnter in chat, how many bulk you wish to &dSELL&a. There are &e{0}&a items per bulk and you have &e{1}&a bulks available. Enter &ball&a in chat to sell all.", "language": { - "name": "&eName: &6{0}", - "code": "&eCode: &6{0}", - "translate-progress": "&eTranslation Progress: &b{0}%", - "approval-progress": "&eApproval Progress: &b{0}%", - "qa-issues": "&eQuality assurance issues: &b{0}%", - "help-us": "&a[Help us improve the translation quality]" + "name": "&e名前: &6{0}", + "code": "&eコード: &6{0}", + "translate-progress": "&e翻訳の進行状況: &b{0}%", + "approval-progress": "&e承認の進行状況: &b{0}%", + "qa-issues": "&e品質保証の問題: &b{0}%", + "help-us": "&a[翻訳の品質向上にご協力ください]" } } \ No newline at end of file diff --git a/src/main/resources/lang/pt-BR/messages.json b/src/main/resources/lang/pt-BR/messages.json index 930f40d33..019f863ec 100644 --- a/src/main/resources/lang/pt-BR/messages.json +++ b/src/main/resources/lang/pt-BR/messages.json @@ -1,5 +1,5 @@ { - "translation-author": "Tradutor: IceZombie13, Lufano", + "translation-author": "Translator: Ghost_chu, Andre_601", "translation-version": "Versão: Reremake", "translation-contributors": "Contribuidores: IceZombie13, Timtower, Netherfoam, KaiNoMood, Mgazul, JackTheChicken e Andre_601", "translation-country": "Zona do idioma: Português Brasileiro (pt_BR)", diff --git a/src/main/resources/lang/ro-RO/messages.json b/src/main/resources/lang/ro-RO/messages.json index 074988344..c2b7021e2 100644 --- a/src/main/resources/lang/ro-RO/messages.json +++ b/src/main/resources/lang/ro-RO/messages.json @@ -1,63 +1,63 @@ { - "translation-author": "Translator: Ghost_chu, Andre_601", - "translation-version": "Support Version: Reremake", - "translation-contributors": "Contributors: Timtower, Netherfoam, KaiNoMood, Mgazul, JackTheChicken and Andre_601", - "translation-country": "Language Zone: English (en_US)", + "translation-author": "Traducător: Ghost_chu, Andre_601", + "translation-version": "Versiune suport: Reproducere", + "translation-contributors": "Contribuitori: Turnul, Netherfoam, KaiNoMood, Mgazul, JackTheChicken și Andre_601", + "translation-country": "Zona de Limbă: Engleză (ro_US)", "language-version": "41", - "not-looking-at-shop": "&cCould not find a QuickShop. You need to look at one.", - "no-anythings-in-your-hand": "&cThere is nothing in your hand.", - "no-permission": "&cYou do not have permission to do that.", - "integrations-check-failed-create": "&cIntegration {0} denied the shop-creation", - "integrations-check-failed-trade": "&cIntegration {0} denied the Shop trading", - "3rd-plugin-build-check-failed": "&c3rd party plugin &l{0}&r&c denied the permission checks, did you have permission setup in there?", - "no-creative-break": "&cYou cannot break other players shops in creative mode, switch to survival mode or try to use the supertool {0} instead.", - "trading-in-creative-mode-is-disabled": "&cYou cannot trade with this shop while being in creative mode.", - "supertool-is-disabled": "&cSupertool is disabled. Cannot break any shops.", - "no-double-chests": "&cYou cannot create the double chest shop.", - "not-managed-shop": "&cYou are not the owner or moderator of this Shop", - "shop-already-owned": "&cThis is already a shop.", - "chest-was-removed": "&cThe chest was removed.", - "price-too-cheap": "&cPrice must be greater than &e${0}", - "no-price-change": "&cThis wouldn't result in a price change!", - "you-cant-afford-a-new-shop": "&cIt costs {0} to create a new shop.", - "player-bought-from-your-store-tax": "&c{0} purchased {1} {2} from your shop, and you paid {3} in taxes.", - "you-cant-afford-to-change-price": "&cIt costs {0} to change the price in your shop.", - "success-created-shop": "&cShop created.", - "success-removed-shop": "&aShop removed.", - "shops-arent-locked": "&cRemember, shops are NOT protected from theft! If you want to stop thieves, lock it with LWC, Lockette, etc!", - "shop-creation-cancelled": "&cShop creation cancelled.", - "shop-purchase-cancelled": "&cShop purchase cancelled.", - "shop-stock-too-low": "&cThe shop only has {0} {1} left!", - "you-cant-afford-to-buy": "&cIt costs {0}, but you only have {1}", - "negative-amount": "&cYou can't trade negative amounts", - "not-a-number": "&cYou can only input a number, your input was {0}.", - "not-a-integer": "&cYou must input a number, your input was {0}.", - "player-bought-from-your-store": "&c{0} purchased {1} {2} from your shop.", - "shop-out-of-stock": "&5Your shop at {0}, {1}, {2} has run out of {3}!", - "shop-has-no-space": "&cThe shop only has room for {0} more {1}.", - "you-dont-have-that-many-items": "&cYou only have {0} {1}.", - "the-owner-cant-afford-to-buy-from-you": "&cThis costs {0}, but the shop-owner only has {1}", - "player-sold-to-your-store": "&a{0} sold {1} {2} to your shop.", - "shop-out-of-space": "&5Your shop at {0}, {1}, {2} is now full.", - "fee-charged-for-price-change": "&aYou paid &c{0}&a to change the price.", - "price-is-now": "&aThe new price of the shop is &e{0}", + "not-looking-at-shop": "&cNu am putut gasi un magazin. Trebuie sa te uiti la unul.", + "no-anythings-in-your-hand": "&cNu este nimic in mana.", + "no-permission": "&cNu ai permisiunea să faci asta.\".", + "integrations-check-failed-create": "&cIntegrarea {0} a refuzat crearea magazinului", + "integrations-check-failed-trade": "&cIntegrarea {0} a refuzat crearea magazinului", + "3rd-plugin-build-check-failed": "&c3rd plugin &l{0}&r&c a respins verificarile permisiunilor, ai permisiunile setari acolo?", + "no-creative-break": "&cNu poti strica magazinele altor jucatori in mod creativ, sa treci la modul de supravietuire sau sa incerci sa folosesti superunealta {0}.", + "trading-in-creative-mode-is-disabled": "&cNu poti face comert cu acest magazin in timp ce te afli in modul creativ.", + "supertool-is-disabled": "&cSupertool-ul este dezactivat. Nu se pot sparge magazinele.", + "no-double-chests": "&cNu poti crea un magazin dublu.", + "not-managed-shop": "&cNu sunteti proprietarul sau moderatorul acestui magazin", + "shop-already-owned": "&cAcesta este deja un magazin.", + "chest-was-removed": "&cLada a fost stearsa.", + "price-too-cheap": "&cPretul trebuie sa fie mai mare decat${0}", + "no-price-change": "&cAceasta nu ar duce la o schimbare de pret!", + "you-cant-afford-a-new-shop": "&cCrearea unui magazin nou costa {0}.", + "player-bought-from-your-store-tax": "&c{0} a cumparat {1} {2} de la magazinul tau si ai plătit {3} din impozite.", + "you-cant-afford-to-change-price": "&cSchimbarea pretului magazinului tau costa {0}.", + "success-created-shop": "&cMagazin creat.", + "success-removed-shop": "&aMagazin eliminat.", + "shops-arent-locked": "&cAmintiți-vă, magazinele NU sunt protejate de furt! Dacă doriți să opriți hoții, blocați-le cu LWC, Lockette, etc!", + "shop-creation-cancelled": "Crearea &cShop a fost anulata.", + "shop-purchase-cancelled": "&cAchizitie a fost anulata.", + "shop-stock-too-low": "&cMagazinul mai are {0} {1}!", + "you-cant-afford-to-buy": "&cCosta {0}, dar ai doar {1}", + "negative-amount": "&cNu poti tranzacționa sume negative", + "not-a-number": "&cPoti sa introduci doar un numar, intrarea ta a fost {0}.", + "not-a-integer": "&cTrebuie sa introduci un numar, intrarea ta a fost de {0}.", + "player-bought-from-your-store": "&c{0} a cumparat {1} {2} din magazinul tau.", + "shop-out-of-stock": "&5Magazinul tau la {0}, {1}, {2} a expirat din {3}!", + "shop-has-no-space": "&cMagazinul are loc doar pentru {0} inca {1}.", + "you-dont-have-that-many-items": "&cAi doar {0} {1}.", + "the-owner-cant-afford-to-buy-from-you": "&cAceasta costa {0}, dar proprietarul magazinului are doar {1}", + "player-sold-to-your-store": "&a{0} a vândut {1} {2} magazinului tău.", + "shop-out-of-space": "&5Magazinul tau la {0}, {1}, {2} este acum plin.", + "fee-charged-for-price-change": "&aAi achitat{0}&a pentru a schimba pretul.", + "price-is-now": "&aNoul pret al magazinului este &e{0}", "thats-not-a-number": "&cInvalid number", - "no-price-given": "&cPlease give a valid price.", - "average-price-nearby": "&aNearby average price: &e{0}", - "shop-has-changed": "&cThe shop you tried to use has changed since you clicked it!", - "shop-not-exist": "&cThere is no shop.", - "nearby-shop-this-way": "&aShop is {0} blocks away from you.", - "no-nearby-shop": "&cNo nearby shop matching {0}.", - "buying-more-than-selling": "&cWARNING: You are buying items for more than you are selling them!", - "not-enough-space": "&cYou only have room for {0} more!", - "refill-success": "&aRefill successful", - "empty-success": "&aEmptying shop successful", + "no-price-given": "&cTe rugam sa dai un pret valid.", + "average-price-nearby": "&aPret mediu apropiat: &e{0}", + "shop-has-changed": "&cMagazinul pe care ai incercat sa il folosesti s-a schimbat de cand ai apasat pe el!", + "shop-not-exist": "&cNu exista magazin.", + "nearby-shop-this-way": "&aMagazinul este la {0} blocuri distanţă de tine.", + "no-nearby-shop": "&cNiciun magazin din apropiere nu se potriveste cu {0}.", + "buying-more-than-selling": "&cATENTIE: Cumpari articole pentru mai mult decat le vindeti!", + "not-enough-space": "&cMagazinul are loc doar pentru {0} inca!", + "refill-success": "&aReîncărcare reușită", + "empty-success": "&aMagazinul a fost de succes", "admin-shop": "AdminShop", - "unknown-owner": "Unknown", - "owner-bypass-check": "&eBypassed all checks. Trade successful! (You are now the shop owner!)", - "reached-maximum-can-create": "&cYou already created a maximum of {0}/{1} shops!", - "restricted-prices": "&cRestricted price for {0}: Min {1}, max {2}", - "no-enough-money-to-keep-shops": "&cYou didn't have enough money to keep your shops! All shops have been removed...", + "unknown-owner": "Necunoscută", + "owner-bypass-check": "&eA trecut toate cecurile. Tranzacționați cu succes! (Fii proprietarul magazinului!)", + "reached-maximum-can-create": "&cAi creat deja un maxim de {0}/{1} magazine!", + "restricted-prices": "&cPret limitat pentru {0}: Min {1}, max {2}", + "no-enough-money-to-keep-shops": "&cNu ai destui bani pentru a-ti pastra magazinele! Toate magazinele au fost sterse...", "nothing-to-flush": "&aYou have no new shop messages.", "break-shop-use-supertool": "&eYou can break the shop by using the SuperTool.", "failed-to-put-sign": "&cNot enough space around the shop to place the info sign.", @@ -102,43 +102,43 @@ "bypassing-lock": "&cBypassing a QuickShop lock!", "that-is-locked": "&cThis shop is locked.", "how-many-buy": "&aEnter in chat, how many you wish to &bBUY&a. You can buy &e{0}&a. Enter &ball&a to buy them all.", - "how-many-sell": "&aEnter in chat, how much you wish to &dSELL&a. You have &e{0}&a available. Enter &ball&a in chat, to sell all.", - "not-allowed-to-create": "&cYou may not create a shop here.", - "blacklisted-item": "&cYou cannot sell this item because it is on the blacklist", - "how-much-to-trade-for": "&aEnter in chat, how much you wish to trade &e{1}x {0}&a for.", + "how-many-sell": "&aIntra in chat, cat de mult doresti sa ai &dSELL&a. Ai &{0}&un disponibil. Introdu &ball&la chat, pentru a vinde pe toate.", + "not-allowed-to-create": "&cNu poti crea un magazin aici.", + "blacklisted-item": "&cNu poti vinde acest obiect pentru ca este pe lista neagra", + "how-much-to-trade-for": "&aIntra in chat, cat de mult doresti sa tranzacționezi &{1}x {0}&a.", "command": { "toggle-unlimited": { - "unlimited": "&aShop is now unlimited", - "limited": "&aShop is now limited" + "unlimited": "&aMagazinul este acum nelimitat", + "limited": "&aMagazinul este acum limitat" }, - "transfer-success": "&aTransferred &e{0} &ashop(s) to &e{1}", - "transfer-success-other": "&aTransferred &e{0} {1}&a's shop(s) to &e{2}", - "some-shops-removed": "&e{0} &ashop(s) removed", - "no-owner-given": "&cNo owner provided", - "new-owner": "&aNew owner: &e{0}", - "now-buying": "&aNow &dBUYING &e{0}", - "now-selling": "&aNow &bSELLING &e{0}", - "cleaning": "&aRemoving shops without any stock...", + "transfer-success": "&aTransferat &{0} &ashop(i) catre{1}", + "transfer-success-other": "&aTransferat &{0} {1}Magazine ale &lui{2}", + "some-shops-removed": "&e{0} &ashop(uri) eliminat(e)", + "no-owner-given": "&cNiciun proprietar", + "new-owner": "&aUn proprietar nou: &e{0}", + "now-buying": "&aAcum &dCUMPĂRĂ&e{0}", + "now-selling": "&aAcum &n&mut{0}", + "cleaning": "&aScoaterea magazinelor fara stoc...", "reloading": "&aReloading...", - "cleaned": "&aRemoved &e{0}&a shops.", - "no-type-given": "&cUsage: /qs find ", - "bulk-size-not-set": "&cUsage: /qs size ", - "bulk-size-now": "&aNow trading &e{0}x {1}", - "invalid-bulk-amount": "&cThe given value {0} is larger than max stack size or lower than one", - "no-trade-item": "&aPlease hold a trade item to change in main hand", - "trade-item-now": "&aNow trading &e{0}x {1}", - "no-amount-given": "&cNo amount provided. Use &a/qs refill &c", - "now-debuging": "&aSuccessfully enabled developer mode. Reloading QuickShop...", - "now-nolonger-debuging": "&aSuccessfully disabled Developer mode. Reloading QuickShop...", - "wrong-args": "&cInvalid arguments. Use &l/qs help &rto preview the list of commands.", + "cleaned": "&aA eliminat &{0} magazine.", + "no-type-given": "&fFoloseste /qs gaseste ", + "bulk-size-not-set": "&fFoloseste marimea /qs size ", + "bulk-size-now": "&aAcum tranzacționarea &e{0}x {1}", + "invalid-bulk-amount": "&cValoarea data {0} este mai mare decat dimensiunea maxima a stivei sau mai mica decat una", + "no-trade-item": "&aTe rugam sa tii un articol de vanzare pentru a se schimba in mana principala", + "trade-item-now": "&aAcum tranzacționarea &e{0}x {1}", + "no-amount-given": "&cNicio suma furnizata. Foloseste &a/qs reîncărcare &c", + "now-debuging": "&aActivare modul dezvoltator activata cu succes. Reincarcare quickShop...", + "now-nolonger-debuging": "&aMod dezvoltator dezactivat cu succes. Reîncărcare cu quickhop...", + "wrong-args": "&cArgumente incorecte. Foloseste &r&o/qs ajuta sa previzualizezi lista de comenzi.", "description": { - "title": "&aQuickShop help", - "unlimited": "&eGives a shop unlimited stock.", - "setowner": "&eChanges the ownership of a shop.", - "owner": "&eChanges the ownership of a shop.", - "buy": "&eChanges a shop to &dBUY&e mode", - "sell": "&eChanges a shop to &bSELL&e mode", - "price": "&eChanges the buy/sell price of a shop", + "title": "&aAjutor QuickShop", + "unlimited": "&fOfera magazinului un stoc nelimitat.", + "setowner": "&eSchimba proprietarul unui magazin.", + "owner": "&eSchimba proprietarul unui magazin.", + "buy": "&eSchimba un magazin in modul &dBUY&e", + "sell": "&eSchimba un magazin in modul &dBUY&e", + "price": "&eModifica pretul de cumparare/vânzare al unui magazin", "clean": "&eRemoves all (loaded) shops without any stock", "find": "&eLocates the nearest shop of a specific type.", "reload": "&eReloads the config.yml of QuickShop", diff --git a/src/main/resources/lang/zh-CN/messages.json b/src/main/resources/lang/zh-CN/messages.json index acf1c8071..c46233d5a 100644 --- a/src/main/resources/lang/zh-CN/messages.json +++ b/src/main/resources/lang/zh-CN/messages.json @@ -49,7 +49,7 @@ "nearby-shop-this-way": "&a商店距离你 {0} 格远", "no-nearby-shop": "&c附近没有匹配 {0} 的商店。", "buying-more-than-selling": "&c警告: 你收购的物品价格比出售的要高!", - "not-enough-space": "&c此商店空间不足,剩余 {0}", + "not-enough-space": "&c背包空间不足,剩余 {0}", "refill-success": "&a填货成功", "empty-success": "&a清空商店成功", "admin-shop": "系统商店", @@ -60,7 +60,7 @@ "no-enough-money-to-keep-shops": "&c你没有足够的金钱去维持你商店的运营!所有商店已被移除...", "nothing-to-flush": "&a你没有新的商店消息", "break-shop-use-supertool": "&e您可以使用超级工具来破坏商店。", - "failed-to-put-sign": "&c商店没有足够的空间放置信息牌。", + "failed-to-put-sign": "&c没有足够的空间放置商店的信息牌子。", "failed-to-paste": "&c无法将数据上传到Pastebin,请检查你的网络连接并重试。(查看后台获取详情)", "warn-to-paste": "&e收集并上传数据到Pastebin,这会花费点时间。&c&l警告&c,数据将会在一周内对外可见,可能会导致你泄露服务器的配置和其他敏感信息,确保只向&l你信任的人/开发者&c发送链接。", "price-too-high": "&c商品的价格太高了!你不能创建价格高于 {0} 的商店。", diff --git a/src/main/resources/lang/zh-TW/messages.json b/src/main/resources/lang/zh-TW/messages.json index 27fbbf4f2..72f093328 100644 --- a/src/main/resources/lang/zh-TW/messages.json +++ b/src/main/resources/lang/zh-TW/messages.json @@ -1,6 +1,6 @@ { "translation-author": "翻譯人員:Ghost_chu、Andre_601、Flandre_tw(主翻譯)、Terence#3062(主翻譯)", - "translation-version": "支援版本:Reremake(重製重製版)", + "translation-version": "支援版本:Reremake(重製版)", "translation-contributors": "貢獻人員:Timtower、Netherfoam、KaiNoMood、Mgazul、JackTheChicken 和 Andre_601", "translation-country": "語言:&b&l繁體中文 Chinese Traditional(zh_TW)", "language-version": "41",