From 5efa6773aef630436cefb62a7980532f3027e71a Mon Sep 17 00:00:00 2001 From: Kiran Hart Date: Mon, 7 Oct 2024 12:17:01 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A2=20Added=20unique=20min/max=20price?= =?UTF-8?q?=20options=20w/lang=20options=20for=20requests.=20Closes=20#100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Took 3 minutes --- .../java/ca/tweetzy/auctionhouse/commands/CommandRequest.java | 4 ++-- .../java/ca/tweetzy/auctionhouse/commands/CommandSell.java | 1 - .../java/ca/tweetzy/auctionhouse/settings/LocaleSettings.java | 4 ++++ src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandRequest.java b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandRequest.java index 3437391..1cf76e7 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandRequest.java +++ b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandRequest.java @@ -140,12 +140,12 @@ public class CommandRequest extends Command { final double price = Double.parseDouble(args[0]); if (price < Settings.MIN_AUCTION_PRICE.getDouble()) { - AuctionHouse.getInstance().getLocale().getMessage("pricing.minbaseprice").processPlaceholder("price", Settings.MIN_AUCTION_PRICE.getDouble()).sendPrefixedMessage(player); + AuctionHouse.getInstance().getLocale().getMessage("pricing.request.min price").processPlaceholder("price", Settings.MIN_REQUEST_PRICE.getDouble()).sendPrefixedMessage(player); return ReturnType.FAIL; } if (price > Settings.MAX_AUCTION_PRICE.getDouble()) { - AuctionHouse.getInstance().getLocale().getMessage("pricing.maxbaseprice").processPlaceholder("price", Settings.MIN_AUCTION_PRICE.getDouble()).sendPrefixedMessage(player); + AuctionHouse.getInstance().getLocale().getMessage("pricing.request.max price").processPlaceholder("price", Settings.MAX_REQUEST_PRICE.getDouble()).sendPrefixedMessage(player); return ReturnType.FAIL; } diff --git a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandSell.java b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandSell.java index a4797cd..399cfb5 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandSell.java +++ b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandSell.java @@ -157,7 +157,6 @@ public final class CommandSell extends Command { boolean isStackPrice = false; boolean partialBuy = false; boolean serverAuction = false; - boolean isRequest = false; List timeSets = Arrays.asList( "second", diff --git a/src/main/java/ca/tweetzy/auctionhouse/settings/LocaleSettings.java b/src/main/java/ca/tweetzy/auctionhouse/settings/LocaleSettings.java index 270f929..c78db5a 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/settings/LocaleSettings.java +++ b/src/main/java/ca/tweetzy/auctionhouse/settings/LocaleSettings.java @@ -109,6 +109,10 @@ public class LocaleSettings { languageNodes.put("general.priority boost.boosted", "&aSuccessfully boosted this item to the top of the Auction House"); languageNodes.put("general.priority boost.already boosted", "&cThis item already has priority listing"); + languageNodes.put("pricing.request.min price", "&cThe minimum request price must be &a%price%"); + languageNodes.put("pricing.request.max price", "&cThe maximum request price is &a%price%"); + + languageNodes.put("pricing.minbaseprice", "&cThe minimum base price must be &a%price%"); languageNodes.put("pricing.minstartingprice", "&cThe minimum starting bid price must be &a%price%"); languageNodes.put("pricing.minbidincrementprice", "&cThe minimum bid increment must be &a%price%"); diff --git a/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java b/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java index 585b9f9..22ce691 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java +++ b/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java @@ -116,6 +116,8 @@ public class Settings { public static final ConfigSetting OWNER_CAN_FULFILL_OWN_REQUEST = new ConfigSetting(config, "auction setting.purchase.owner can fulfill own request", false, "Should the owner of a request be able to fulfill it", "This probably should be set to false..."); public static final ConfigSetting MAX_REQUEST_AMOUNT = new ConfigSetting(config, "auction setting.max request amount", 64, "How much of an item should a player be able to ask for in a single request?"); public static final ConfigSetting BLOCK_REQUEST_USING_FILLED_SHULKER = new ConfigSetting(config, "auction setting.block requests using filled shulkers", true, "If false, players can request make a request using a shulker that contains items"); + public static final ConfigSetting MIN_REQUEST_PRICE = new ConfigSetting(config, "auction setting.pricing.min request price", 1, "The minimum price for a request"); + public static final ConfigSetting MAX_REQUEST_PRICE = new ConfigSetting(config, "auction setting.pricing.max request price", 1000000000, "The maximum price for a request"); public static final ConfigSetting AUTO_REFRESH_AUCTION_PAGES = new ConfigSetting(config, "auction setting.auto refresh auction pages", true, "Should auction pages auto refresh?");