Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-12-02 15:03:22 +01:00
Code Issues Projects Releases Wiki Activity

Move more info to hover in shop messages to clean up chat

Browse Source 
Also fix placeholders not working in not enough stock message
This commit is contained in:
Phoenix616 2020-06-28 22:55:21 +01:00
parent a0630db6f8
commit 3c51f8ed87
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/Acrobot/ChestShop/Listeners/PreTransaction/ErrorMessageSender.java
View File

@ -91,12 +91,12 @@ public class ErrorMessageSender implements Listener {
if (Properties.SHOW_MESSAGE_OUT_OF_STOCK && !Properties.CSTOGGLE_TOGGLES_OUT_OF_STOCK || !Toggle.isIgnoring(event.getOwnerAccount().getUuid())) { if (Properties.SHOW_MESSAGE_OUT_OF_STOCK && !Properties.CSTOGGLE_TOGGLES_OUT_OF_STOCK || !Toggle.isIgnoring(event.getOwnerAccount().getUuid())) {
Location loc = event.getSign().getLocation(); Location loc = event.getSign().getLocation();
sendMessageToOwner(event.getOwnerAccount(), NOT_ENOUGH_STOCK_IN_YOUR_SHOP, new String[]{ sendMessageToOwner(event.getOwnerAccount(), NOT_ENOUGH_STOCK_IN_YOUR_SHOP, new String[]{
"%price", Economy.formatBalance(event.getExactPrice()), "price", Economy.formatBalance(event.getExactPrice()),
"%buyer", event.getClient().getName(), "buyer", event.getClient().getName(),
"%world", loc.getWorld().getName(), "world", loc.getWorld().getName(),
"%x", String.valueOf(loc.getBlockX()), "x", String.valueOf(loc.getBlockX()),
"%y", String.valueOf(loc.getBlockY()), "y", String.valueOf(loc.getBlockY()),
"%z", String.valueOf(loc.getBlockZ()) "z", String.valueOf(loc.getBlockZ())
}, event.getStock()); }, event.getStock());
} }
message = Messages.NOT_ENOUGH_STOCK; message = Messages.NOT_ENOUGH_STOCK;

8
src/main/resources/languages/lang.en.yml
View File

@ -34,16 +34,16 @@ NO_SELLING_HERE: "You can't sell here!"
NOT_ENOUGH_SPACE_IN_INVENTORY: "You haven't got enough space in inventory!" NOT_ENOUGH_SPACE_IN_INVENTORY: "You haven't got enough space in inventory!"
NOT_ENOUGH_SPACE_IN_CHEST: "There isn't enough space in chest!" NOT_ENOUGH_SPACE_IN_CHEST: "There isn't enough space in chest!"
NOT_ENOUGH_ITEMS_TO_SELL: "You don't have enough items to sell!" NOT_ENOUGH_ITEMS_TO_SELL: "You don't have enough items to sell!"
NOT_ENOUGH_SPACE_IN_YOUR_SHOP: "[%price %item&7 shop](At world: &f%world\nPosition: &f%x/%y/%z)&7 is full! (%seller tried to sell)" NOT_ENOUGH_SPACE_IN_YOUR_SHOP: "[%price %item&7 shop is full!](&f%seller&7 tried to sell\n&7In world: &f%world\n&7At position: &f%x/%y/%z)"
NOT_ENOUGH_STOCK: "This shop is out of stock." NOT_ENOUGH_STOCK: "This shop is out of stock."
NOT_ENOUGH_STOCK_IN_YOUR_SHOP: "[%price %item&7 shop](At world: &f%world\nPosition: &f%x/%y/%z)&7 is out of stock! (%buyer tried to buy)" NOT_ENOUGH_STOCK_IN_YOUR_SHOP: "[%price %item&7 shop is out of stock!](&f%buyer&7 tried to buy\n&7In world: &f%world\n&7At position: &f%x/%y/%z)"
YOU_BOUGHT_FROM_SHOP: "You bought %item from %owner for %price." YOU_BOUGHT_FROM_SHOP: "You bought %item from %owner for %price."
SOMEBODY_BOUGHT_FROM_YOUR_SHOP: "%buyer bought %item for %price from your shop at %world/%x/%y/%z." SOMEBODY_BOUGHT_FROM_YOUR_SHOP: "[%buyer bought %item for %price.](&7In world: &f%world\n&7At position: &f%x/%y/%z)"
YOU_SOLD_TO_SHOP: "You sold %item to %buyer for %price." YOU_SOLD_TO_SHOP: "You sold %item to %buyer for %price."
SOMEBODY_SOLD_TO_YOUR_SHOP: "%seller sold %item for %price to your shop at %world/%x/%y/%z." SOMEBODY_SOLD_TO_YOUR_SHOP: "[%seller sold %item for %price.](&7In world: &f%world\n&7At position: &f%x/%y/%z)"
YOU_CANNOT_CREATE_SHOP: "You can't create this type of shop!" YOU_CANNOT_CREATE_SHOP: "You can't create this type of shop!"
NO_CHEST_DETECTED: "Couldn't find a chest!" NO_CHEST_DETECTED: "Couldn't find a chest!"