From 3bb48f134f52b7034ef710935924ae890377fe0f Mon Sep 17 00:00:00 2001 From: Kiran Hart Date: Fri, 17 Nov 2023 20:17:33 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=B7=EF=B8=8F=20add=20option=20to=20for?= =?UTF-8?q?ce=20material=20names=20in=20discord=20web=20hook?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Took 3 minutes --- .../auctionhouse/helpers/discord/DiscordMessageCreator.java | 3 ++- src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/tweetzy/auctionhouse/helpers/discord/DiscordMessageCreator.java b/src/main/java/ca/tweetzy/auctionhouse/helpers/discord/DiscordMessageCreator.java index 4d10e4f..d8d0386 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/helpers/discord/DiscordMessageCreator.java +++ b/src/main/java/ca/tweetzy/auctionhouse/helpers/discord/DiscordMessageCreator.java @@ -22,6 +22,7 @@ import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.auction.AuctionedItem; import ca.tweetzy.auctionhouse.helpers.AuctionCreator; import ca.tweetzy.auctionhouse.settings.Settings; +import ca.tweetzy.flight.utils.ChatUtil; import ca.tweetzy.flight.utils.ItemUtil; import lombok.NonNull; import lombok.SneakyThrows; @@ -89,7 +90,7 @@ public final class DiscordMessageCreator { DiscordWebhook.EmbedObject embed = generateBaseEmbed(); embed.addField(Settings.DISCORD_MSG_FIELD_SELLER_NAME.getString(), Settings.DISCORD_MSG_FIELD_SELLER_VALUE.getString().replace("%seller%", this.listing.isServerItem() ? AuctionCreator.SERVER_LISTING_NAME : this.seller.getName()), Settings.DISCORD_MSG_FIELD_SELLER_INLINE.getBoolean()); - embed.addField(Settings.DISCORD_MSG_FIELD_ITEM_NAME.getString(), Settings.DISCORD_MSG_FIELD_ITEM_VALUE.getString().replace("%item_name%", "x" + this.listing.getItem().getAmount() + " " + ChatColor.stripColor(ItemUtil.getItemName(this.listing.getItem()))), Settings.DISCORD_MSG_FIELD_SELLER_INLINE.getBoolean()); + embed.addField(Settings.DISCORD_MSG_FIELD_ITEM_NAME.getString(), Settings.DISCORD_MSG_FIELD_ITEM_VALUE.getString().replace("%item_name%", "x" + this.listing.getItem().getAmount() + " " + ChatColor.stripColor(Settings.FORCE_MATERIAL_NAMES_FOR_DISCORD.getBoolean() ? ChatUtil.capitalize(this.listing.getItem().getType()) : ItemUtil.getItemName(this.listing.getItem()))), Settings.DISCORD_MSG_FIELD_SELLER_INLINE.getBoolean()); switch (this.messageType) { case NEW_AUCTION_LISTING: diff --git a/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java b/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java index 2fcf7e4..38c981f 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java +++ b/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java @@ -215,6 +215,7 @@ public class Settings { public static final ConfigSetting SELF_FILTER_ENABLED = new ConfigSetting(config, "auction setting.enabled filters.self", true, "Should this filter be enabled?"); public static final ConfigSetting USE_AUCTION_CHEST_MODE = new ConfigSetting(config, "auction setting.use auction chest mode", false, "Enabling this will make it so players can only access the auction through the auction chest"); public static final ConfigSetting AUTO_BSTATS = new ConfigSetting(config, "auction setting.auto bstats", true, "Auto enable bStats"); + public static final ConfigSetting FORCE_MATERIAL_NAMES_FOR_DISCORD = new ConfigSetting(config, "auction setting.force material names for discord", false, "If true, auction house will use the actual material name rather than custom name"); public static final ConfigSetting ALLOW_ITEM_BUNDLES = new ConfigSetting(config, "auction setting.bundles.enabled", true, "If true, players can use -b in the sell command to bundle all similar items into a single item."); public static final ConfigSetting ITEM_BUNDLE_ITEM = new ConfigSetting(config, "auction setting.bundles.item", XMaterial.GOLD_BLOCK.name());