Altitude/PlayerShops
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12 from Altitude-Devs/messages

Browse Source 
Messages, Fixes #6
This commit is contained in:
destro174 2022-09-02 08:34:38 +02:00 committed by GitHub
parent 858162165f 2228e45ed4
commit d23b8e0f1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/alttd/playershops/config/ShopTypeConfig.java
View File

@ -55,7 +55,10 @@ public class ShopTypeConfig {
public String playerInventoryFull = "<red>You do not have enough space in your inventory to buy from this shop.";
public String playerNoFunds = "<red>You do not have sufficient funds to trade with this shop.";
public String playerNoItems = "<red>You do not have sufficient items to trade with this shop.";
public String playerBought = "<white>You bought <amount> <item>(s) from <ownername> for <price>.";
public String playerSold = "<white>You sold <amount> <item>(s) to <ownername> for <price>.";
public String shopBought = "<white><user> sold <amount> <item>(s) to you for <price>.";
public String shopSold = "<white><user> bought <amount> <item>(s) from you for <price>.";
public String shopInventoryFull = "<red>This shop does not have enough space in its inventory.";
public String shopNoStock = "<red>This shop is out of stock.";
@ -64,6 +67,9 @@ public class ShopTypeConfig {
private void transactionMessages() {
playerInventoryFull = getString("transaction.player-inventory-full", playerInventoryFull);
playerNoFunds = getString("transaction.player-no-funds", playerNoFunds);
playerNoItems = getString("transaction.player-no-items", playerNoItems);
playerBought = getString("transaction.player-bought", playerBought);
playerSold = getString("transaction.player-sold", playerSold);
shopInventoryFull = getString("transaction.shop-inventory-full", shopInventoryFull);
shopNoStock = getString("transaction.shop-no-stock", shopNoStock);
yourShopNoFunds = getString("transaction.your-shop-no-funds", yourShopNoFunds);

12
src/main/java/com/alttd/playershops/listener/TransactionListener.java
View File

@ -6,6 +6,7 @@ import com.alttd.playershops.gui.ShopManagementGui;
import com.alttd.playershops.handler.ShopHandler;
import com.alttd.playershops.hook.WorldGuardHook;
import com.alttd.playershops.shop.PlayerShop;
import com.alttd.playershops.shop.ShopType;
import com.alttd.playershops.shop.TransactionError;
import com.alttd.playershops.utils.Logger;
import com.alttd.playershops.utils.ShopUtil;
@ -124,6 +125,9 @@ public class TransactionListener extends EventListener {
case INSUFFICIENT_FUNDS_PLAYER -> {
player.sendMiniMessage(shop.getType().getShopTypeConfig().playerNoFunds, placeholders);
}
case INSUFFICIENT_ITEMS_PLAYER -> {
player.sendMiniMessage(shop.getType().getShopTypeConfig().playerNoItems, placeholders);
}
case INVENTORY_FULL_SHOP -> {
Player shopOwner = Bukkit.getPlayer(shop.getOwnerUUID());
if (shopOwner != null && notifyOwner(shop)) {
@ -138,7 +142,13 @@ public class TransactionListener extends EventListener {
}
return;
}
player.sendActionBar(Util.parseMiniMessage(shop.getType().getShopTypeConfig().playerBought, placeholders));
if (shop.getType().equals(ShopType.BUY))
player.sendActionBar(Util.parseMiniMessage(shop.getType().getShopTypeConfig().playerSold, placeholders));
else if (shop.getType().equals(ShopType.SELL)) {
player.sendActionBar(Util.parseMiniMessage(shop.getType().getShopTypeConfig().playerBought, placeholders));
} else { //TODO add messages for all shop types
player.sendActionBar(Util.parseMiniMessage("NOT IMPLEMENTED", placeholders));
}
plugin.getDatabaseHelper().logTransaction(player, shop, orders);
}

2
src/main/java/com/alttd/playershops/shop/PlayerShop.java
View File

@ -252,7 +252,7 @@ public class PlayerShop {
int playerItems = InventoryUtils.countItems(player.getInventory(), itemStack);
if (playerItems < itemStack.getAmount())
return TransactionError.INSUFFICIENT_FUNDS_PLAYER;
return TransactionError.INSUFFICIENT_ITEMS_PLAYER;
boolean hasFunds = EconomyUtils.hasSufficientFunds(this, price);
if (!hasFunds)

1
src/main/java/com/alttd/playershops/shop/TransactionError.java
View File

@ -4,6 +4,7 @@ public enum TransactionError {
CANCELLED,
INSUFFICIENT_FUNDS_SHOP,
INSUFFICIENT_FUNDS_PLAYER,
INSUFFICIENT_ITEMS_PLAYER,
INVENTORY_FULL_SHOP,
INVENTORY_FULL_PLAYER,
PLAYER_OFFLINE,