From 2c74a50223c0e93f49477a3068007d7e384d3b2e Mon Sep 17 00:00:00 2001 From: Kiran Hart Date: Mon, 11 Jul 2022 17:06:58 -0400 Subject: [PATCH] project wide code reformat/cleanup Took 37 seconds --- .github/ISSUE_TEMPLATE/report-a-bug.md | 13 ++++++++----- .github/ISSUE_TEMPLATE/request-a-feature.md | 9 ++++----- .../ca/tweetzy/auctionhouse/api/AuctionAPI.java | 8 ++++---- .../auctionhouse/api/events/AuctionEndEvent.java | 2 +- .../auctionhouse/api/hook/PlaceholderAPIHook.java | 1 - .../tweetzy/auctionhouse/auction/AuctionedItem.java | 1 - .../auctionhouse/commands/CommandActive.java | 2 -- .../tweetzy/auctionhouse/commands/CommandAdmin.java | 2 +- .../auctionhouse/commands/CommandAuctionHouse.java | 2 -- .../auctionhouse/commands/CommandExpired.java | 2 -- .../auctionhouse/commands/CommandMarkChest.java | 1 - .../auctionhouse/commands/CommandSearch.java | 2 -- .../auctionhouse/commands/CommandStatus.java | 1 - .../auctionhouse/commands/CommandTransactions.java | 1 - .../_12_SerializeFormatDropMigration.java | 2 -- .../migrations/_13_MinItemPriceMigration.java | 2 -- .../auctionhouse/guis/GUIActiveAuctions.java | 3 +-- .../java/ca/tweetzy/auctionhouse/guis/GUIBans.java | 2 -- .../java/ca/tweetzy/auctionhouse/guis/GUIBid.java | 1 - .../auctionhouse/guis/GUIBundleCreation.java | 1 - .../auctionhouse/guis/GUIContainerInspect.java | 1 - .../tweetzy/auctionhouse/guis/GUIExpiredItems.java | 1 - .../tweetzy/auctionhouse/guis/GUIMinItemPrices.java | 1 - .../ca/tweetzy/auctionhouse/guis/GUISellItem.java | 1 - .../java/ca/tweetzy/auctionhouse/guis/GUIStats.java | 1 - .../auctionhouse/guis/admin/GUIAdminItem.java | 2 -- .../guis/confirmation/GUIConfirmBid.java | 1 - .../guis/confirmation/GUIConfirmCancel.java | 3 +-- .../guis/confirmation/GUIConfirmListing.java | 1 - .../guis/filter/GUIFilterSelection.java | 3 +-- .../guis/transaction/GUITransactionList.java | 3 +-- .../guis/transaction/GUITransactionType.java | 1 - .../guis/transaction/GUITransactionView.java | 1 - .../auctionhouse/listeners/AuctionListeners.java | 1 - .../tweetzy/auctionhouse/listeners/CMIListener.java | 3 --- .../auctionhouse/listeners/EssentialsListener.java | 1 - .../auctionhouse/managers/AuctionStatManager.java | 1 - .../auctionhouse/managers/MinItemPriceManager.java | 1 - .../auctionhouse/tasks/TickAuctionsTask.java | 2 +- 39 files changed, 23 insertions(+), 64 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/report-a-bug.md b/.github/ISSUE_TEMPLATE/report-a-bug.md index 1b6906a..423f0b1 100644 --- a/.github/ISSUE_TEMPLATE/report-a-bug.md +++ b/.github/ISSUE_TEMPLATE/report-a-bug.md @@ -1,28 +1,31 @@ --- -name: Report a Bug -about: Report an issue with the plugin -title: '' -labels: bug -assignees: '' +name: Report a Bug about: Report an issue with the plugin title: '' +labels: bug assignees: '' --- **Describe Bug** + - Describe the bug in as much detail as possible, the more detailed, the chances of it being fixed is faster **How to Reproduce** + - Describe how to reproduce this bug: EX. + 1. Open the main menu 2. Click this button 3. Then do this... etc **What should happen** + - Describe what the expected outcome should be, what should happen? **Screenshots/Videos** + - If any, provide video or image links **Server Information** + - Provide the server version - Provide the server jar (ex. paper/spigot) - Plugin Version \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/request-a-feature.md b/.github/ISSUE_TEMPLATE/request-a-feature.md index c2cd4ab..4b8c040 100644 --- a/.github/ISSUE_TEMPLATE/request-a-feature.md +++ b/.github/ISSUE_TEMPLATE/request-a-feature.md @@ -1,15 +1,14 @@ --- -name: Request a Feature -about: Suggest a change/new feature for the plugin -title: '' -labels: enhancement -assignees: '' +name: Request a Feature about: Suggest a change/new feature for the plugin title: '' +labels: enhancement assignees: '' --- **Describe Feature** + - Describe how this feature will work **Additional Information** + - You can provide image links - You can provide video links \ No newline at end of file diff --git a/src/main/java/ca/tweetzy/auctionhouse/api/AuctionAPI.java b/src/main/java/ca/tweetzy/auctionhouse/api/AuctionAPI.java index 5471932..8b1ea4c 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/api/AuctionAPI.java +++ b/src/main/java/ca/tweetzy/auctionhouse/api/AuctionAPI.java @@ -265,12 +265,12 @@ public class AuctionAPI { String itemName = MMOItemsHook.isEnabled() ? MMOItemsHook.getItemType(itemStack) : ChatColor.stripColor(getItemName(itemStack)); DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject(); - final String playerLost =AuctionHouse.getInstance().getLocale().getMessage("discord.player_lost").getMessage(); + final String playerLost = AuctionHouse.getInstance().getLocale().getMessage("discord.player_lost").getMessage(); final String notSold = AuctionHouse.getInstance().getLocale().getMessage("discord.not_sold").getMessage(); - final String noBuyer =AuctionHouse.getInstance().getLocale().getMessage("discord.no_buyer").getMessage(); + final String noBuyer = AuctionHouse.getInstance().getLocale().getMessage("discord.no_buyer").getMessage(); final String wasNotBought = AuctionHouse.getInstance().getLocale().getMessage("discord.not_bought").getMessage(); - final String isBidTrue =AuctionHouse.getInstance().getLocale().getMessage("discord.is_bid_true").getMessage(); - final String isBidFalse =AuctionHouse.getInstance().getLocale().getMessage("discord.is_bid_false").getMessage(); + final String isBidTrue = AuctionHouse.getInstance().getLocale().getMessage("discord.is_bid_true").getMessage(); + final String isBidFalse = AuctionHouse.getInstance().getLocale().getMessage("discord.is_bid_false").getMessage(); final String isBidWin = AuctionHouse.getInstance().getLocale().getMessage("discord.sale_bid_win").getMessage(); final String immediateBuy = AuctionHouse.getInstance().getLocale().getMessage("discord.sale_immediate_buy").getMessage(); diff --git a/src/main/java/ca/tweetzy/auctionhouse/api/events/AuctionEndEvent.java b/src/main/java/ca/tweetzy/auctionhouse/api/events/AuctionEndEvent.java index eed21a9..e2feae4 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/api/events/AuctionEndEvent.java +++ b/src/main/java/ca/tweetzy/auctionhouse/api/events/AuctionEndEvent.java @@ -1,7 +1,7 @@ package ca.tweetzy.auctionhouse.api.events; -import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType; import ca.tweetzy.auctionhouse.auction.AuctionedItem; +import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType; import lombok.Getter; import lombok.Setter; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/ca/tweetzy/auctionhouse/api/hook/PlaceholderAPIHook.java b/src/main/java/ca/tweetzy/auctionhouse/api/hook/PlaceholderAPIHook.java index f074f0b..3449b08 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/api/hook/PlaceholderAPIHook.java +++ b/src/main/java/ca/tweetzy/auctionhouse/api/hook/PlaceholderAPIHook.java @@ -1,7 +1,6 @@ package ca.tweetzy.auctionhouse.api.hook; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.auction.AuctionPlayer; import lombok.experimental.UtilityClass; import me.clip.placeholderapi.PlaceholderAPI; diff --git a/src/main/java/ca/tweetzy/auctionhouse/auction/AuctionedItem.java b/src/main/java/ca/tweetzy/auctionhouse/auction/AuctionedItem.java index ab1628e..4e6f744 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/auction/AuctionedItem.java +++ b/src/main/java/ca/tweetzy/auctionhouse/auction/AuctionedItem.java @@ -16,7 +16,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; diff --git a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandActive.java b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandActive.java index 8bf7185..3a1e192 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandActive.java +++ b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandActive.java @@ -1,10 +1,8 @@ package ca.tweetzy.auctionhouse.commands; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.auction.AuctionPlayer; import ca.tweetzy.auctionhouse.guis.GUIActiveAuctions; -import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.core.commands.AbstractCommand; import ca.tweetzy.core.utils.TextUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandAdmin.java b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandAdmin.java index 6038c66..f06334f 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandAdmin.java +++ b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandAdmin.java @@ -61,7 +61,7 @@ public class CommandAdmin extends AbstractCommand { if (target == null) { for (OfflinePlayer offlinePlayer : Bukkit.getOfflinePlayers()) { if (offlinePlayer.getName() != null && offlinePlayer.getName().equalsIgnoreCase(args[1])) { - target = offlinePlayer; + target = offlinePlayer; } } } diff --git a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandAuctionHouse.java b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandAuctionHouse.java index dbd1580..54019dc 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandAuctionHouse.java +++ b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandAuctionHouse.java @@ -1,10 +1,8 @@ package ca.tweetzy.auctionhouse.commands; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.auction.AuctionPlayer; import ca.tweetzy.auctionhouse.guis.GUIAuctionHouse; -import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.core.commands.AbstractCommand; import ca.tweetzy.core.utils.TextUtils; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandExpired.java b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandExpired.java index 4e103e6..eb7994e 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandExpired.java +++ b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandExpired.java @@ -1,10 +1,8 @@ package ca.tweetzy.auctionhouse.commands; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.auction.AuctionPlayer; import ca.tweetzy.auctionhouse.guis.GUIExpiredItems; -import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.core.commands.AbstractCommand; import ca.tweetzy.core.utils.TextUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandMarkChest.java b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandMarkChest.java index cdd95ce..db937dc 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandMarkChest.java +++ b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandMarkChest.java @@ -1,7 +1,6 @@ package ca.tweetzy.auctionhouse.commands; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.core.commands.AbstractCommand; import ca.tweetzy.core.compatibility.ServerVersion; import ca.tweetzy.core.compatibility.XMaterial; diff --git a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandSearch.java b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandSearch.java index d9ec1d2..3a5f771 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandSearch.java +++ b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandSearch.java @@ -1,10 +1,8 @@ package ca.tweetzy.auctionhouse.commands; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.auction.AuctionPlayer; import ca.tweetzy.auctionhouse.guis.GUIAuctionHouse; -import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.core.commands.AbstractCommand; import ca.tweetzy.core.utils.TextUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandStatus.java b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandStatus.java index d942538..9722111 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandStatus.java +++ b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandStatus.java @@ -1,7 +1,6 @@ package ca.tweetzy.auctionhouse.commands; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.guis.GUIStats; import ca.tweetzy.core.commands.AbstractCommand; import org.bukkit.command.CommandSender; diff --git a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandTransactions.java b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandTransactions.java index c9b1327..f5598f8 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/commands/CommandTransactions.java +++ b/src/main/java/ca/tweetzy/auctionhouse/commands/CommandTransactions.java @@ -1,7 +1,6 @@ package ca.tweetzy.auctionhouse.commands; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.guis.transaction.GUITransactionList; import ca.tweetzy.auctionhouse.guis.transaction.GUITransactionType; import ca.tweetzy.auctionhouse.settings.Settings; diff --git a/src/main/java/ca/tweetzy/auctionhouse/database/migrations/_12_SerializeFormatDropMigration.java b/src/main/java/ca/tweetzy/auctionhouse/database/migrations/_12_SerializeFormatDropMigration.java index dc3165a..b7a76aa 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/database/migrations/_12_SerializeFormatDropMigration.java +++ b/src/main/java/ca/tweetzy/auctionhouse/database/migrations/_12_SerializeFormatDropMigration.java @@ -1,8 +1,6 @@ package ca.tweetzy.auctionhouse.database.migrations; -import ca.tweetzy.auctionhouse.AuctionHouse; import ca.tweetzy.core.database.DataMigration; -import ca.tweetzy.core.database.MySQLConnector; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/ca/tweetzy/auctionhouse/database/migrations/_13_MinItemPriceMigration.java b/src/main/java/ca/tweetzy/auctionhouse/database/migrations/_13_MinItemPriceMigration.java index 0509479..d1852ad 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/database/migrations/_13_MinItemPriceMigration.java +++ b/src/main/java/ca/tweetzy/auctionhouse/database/migrations/_13_MinItemPriceMigration.java @@ -1,8 +1,6 @@ package ca.tweetzy.auctionhouse.database.migrations; -import ca.tweetzy.auctionhouse.AuctionHouse; import ca.tweetzy.core.database.DataMigration; -import ca.tweetzy.core.database.MySQLConnector; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIActiveAuctions.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIActiveAuctions.java index ef62bd8..962364a 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIActiveAuctions.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIActiveAuctions.java @@ -2,13 +2,12 @@ package ca.tweetzy.auctionhouse.guis; import ca.tweetzy.auctionhouse.AuctionHouse; import ca.tweetzy.auctionhouse.auction.AuctionPlayer; -import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType; import ca.tweetzy.auctionhouse.auction.AuctionedItem; +import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType; import ca.tweetzy.auctionhouse.guis.confirmation.GUIConfirmCancel; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.managers.SoundManager; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.items.TItemBuilder; import org.bukkit.Bukkit; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBans.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBans.java index bcc8600..c66c223 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBans.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBans.java @@ -3,10 +3,8 @@ package ca.tweetzy.auctionhouse.guis; import ca.tweetzy.auctionhouse.AuctionHouse; import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.auction.AuctionBan; -import ca.tweetzy.auctionhouse.auction.AuctionPlayer; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.TimeUtils; import ca.tweetzy.core.utils.items.TItemBuilder; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBid.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBid.java index 2d25f04..4531c03 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBid.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBid.java @@ -8,7 +8,6 @@ import ca.tweetzy.auctionhouse.auction.AuctionedItem; import ca.tweetzy.auctionhouse.guis.confirmation.GUIConfirmBid; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.hooks.EconomyManager; import ca.tweetzy.core.input.PlayerChatInput; import ca.tweetzy.core.utils.NumberUtils; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBundleCreation.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBundleCreation.java index 0d3359c..c89dddf 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBundleCreation.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBundleCreation.java @@ -6,7 +6,6 @@ import ca.tweetzy.auctionhouse.auction.AuctionPlayer; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.core.compatibility.XMaterial; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.utils.PlayerUtils; import ca.tweetzy.core.utils.nms.NBTEditor; import org.bukkit.ChatColor; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIContainerInspect.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIContainerInspect.java index a335116..596fcf2 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIContainerInspect.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIContainerInspect.java @@ -7,7 +7,6 @@ import ca.tweetzy.auctionhouse.auction.AuctionedItem; import ca.tweetzy.auctionhouse.guis.confirmation.GUIConfirmPurchase; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.items.TItemBuilder; import ca.tweetzy.core.utils.nms.NBTEditor; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIExpiredItems.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIExpiredItems.java index dddf09a..acfff50 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIExpiredItems.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIExpiredItems.java @@ -6,7 +6,6 @@ import ca.tweetzy.auctionhouse.auction.AuctionedItem; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.managers.SoundManager; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.utils.PlayerUtils; import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.items.TItemBuilder; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIMinItemPrices.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIMinItemPrices.java index c508731..6b59e93 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIMinItemPrices.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIMinItemPrices.java @@ -5,7 +5,6 @@ import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.auction.MinItemPrice; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.items.TItemBuilder; import org.bukkit.entity.Player; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUISellItem.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUISellItem.java index 2f675cd..766fcd5 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUISellItem.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUISellItem.java @@ -7,7 +7,6 @@ import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.core.compatibility.XMaterial; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.gui.events.GuiClickEvent; import ca.tweetzy.core.input.ChatPrompt; import ca.tweetzy.core.input.PlayerChatInput; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIStats.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIStats.java index a428332..363d5cd 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIStats.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIStats.java @@ -6,7 +6,6 @@ import ca.tweetzy.auctionhouse.auction.AuctionStat; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.managers.AuctionStatManager; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import org.bukkit.entity.Player; import java.util.HashMap; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/admin/GUIAdminItem.java b/src/main/java/ca/tweetzy/auctionhouse/guis/admin/GUIAdminItem.java index 08b851f..8dd641c 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/admin/GUIAdminItem.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/admin/GUIAdminItem.java @@ -1,7 +1,6 @@ package ca.tweetzy.auctionhouse.guis.admin; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.api.events.AuctionAdminEvent; import ca.tweetzy.auctionhouse.auction.AuctionAdminLog; import ca.tweetzy.auctionhouse.auction.AuctionPlayer; @@ -11,7 +10,6 @@ import ca.tweetzy.auctionhouse.guis.AbstractPlaceholderGui; import ca.tweetzy.auctionhouse.guis.GUIAuctionHouse; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.utils.PlayerUtils; import ca.tweetzy.core.utils.TextUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmBid.java b/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmBid.java index 1ed9e53..852caf5 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmBid.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmBid.java @@ -8,7 +8,6 @@ import ca.tweetzy.auctionhouse.auction.AuctionedItem; import ca.tweetzy.auctionhouse.guis.AbstractPlaceholderGui; import ca.tweetzy.auctionhouse.guis.GUIAuctionHouse; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.hooks.EconomyManager; import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.items.TItemBuilder; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmCancel.java b/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmCancel.java index bf25630..af7c6a2 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmCancel.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmCancel.java @@ -2,12 +2,11 @@ package ca.tweetzy.auctionhouse.guis.confirmation; import ca.tweetzy.auctionhouse.AuctionHouse; import ca.tweetzy.auctionhouse.auction.AuctionPlayer; -import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType; import ca.tweetzy.auctionhouse.auction.AuctionedItem; +import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType; import ca.tweetzy.auctionhouse.guis.AbstractPlaceholderGui; import ca.tweetzy.auctionhouse.guis.GUIActiveAuctions; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.items.TItemBuilder; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmListing.java b/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmListing.java index 28d7dde..af37dd1 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmListing.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmListing.java @@ -4,7 +4,6 @@ import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.guis.AbstractPlaceholderGui; import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.core.compatibility.CompatibleHand; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.utils.PlayerUtils; import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.items.TItemBuilder; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/filter/GUIFilterSelection.java b/src/main/java/ca/tweetzy/auctionhouse/guis/filter/GUIFilterSelection.java index fdb75e0..e979143 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/filter/GUIFilterSelection.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/filter/GUIFilterSelection.java @@ -2,13 +2,12 @@ package ca.tweetzy.auctionhouse.guis.filter; import ca.tweetzy.auctionhouse.AuctionHouse; import ca.tweetzy.auctionhouse.api.AuctionAPI; -import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory; import ca.tweetzy.auctionhouse.auction.AuctionPlayer; +import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory; import ca.tweetzy.auctionhouse.guis.AbstractPlaceholderGui; import ca.tweetzy.auctionhouse.guis.GUIAuctionHouse; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.gui.GuiUtils; import ca.tweetzy.core.input.ChatPrompt; import ca.tweetzy.core.utils.TextUtils; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionList.java b/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionList.java index f2b3eb3..d04a265 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionList.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionList.java @@ -8,7 +8,6 @@ import ca.tweetzy.auctionhouse.guis.GUIAuctionHouse; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.auctionhouse.transaction.Transaction; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.items.TItemBuilder; import org.bukkit.Bukkit; @@ -70,7 +69,7 @@ public class GUITransactionList extends AbstractPlaceholderGui { List data = this.transactions.stream().sorted(Comparator.comparingLong(Transaction::getTransactionTime).reversed()).skip((page - 1) * 45L).limit(45).collect(Collectors.toList()); for (Transaction transaction : data) { - final ItemStack item = transaction.getItem().clone(); + final ItemStack item = transaction.getItem().clone(); setButton(slot++, ConfigurationItemHelper.createConfigurationItem(item, Settings.GUI_TRANSACTIONS_ITEM_TRANSACTION_NAME.getString(), Settings.GUI_TRANSACTIONS_ITEM_TRANSACTION_LORE.getStringList(), new HashMap() {{ put("%transaction_id%", transaction.getId().toString()); put("%seller%", Bukkit.getOfflinePlayer(transaction.getSeller()).getName()); diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionType.java b/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionType.java index 1edcc99..0958395 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionType.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionType.java @@ -7,7 +7,6 @@ import ca.tweetzy.auctionhouse.guis.GUIAuctionHouse; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.auctionhouse.transaction.Transaction; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.input.PlayerChatInput; import ca.tweetzy.core.utils.NumberUtils; import ca.tweetzy.core.utils.TextUtils; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionView.java b/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionView.java index 54273ec..ca76576 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionView.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionView.java @@ -8,7 +8,6 @@ import ca.tweetzy.auctionhouse.guis.AbstractPlaceholderGui; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.auctionhouse.transaction.Transaction; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.gui.GuiUtils; import ca.tweetzy.core.utils.TextUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/ca/tweetzy/auctionhouse/listeners/AuctionListeners.java b/src/main/java/ca/tweetzy/auctionhouse/listeners/AuctionListeners.java index 9e45ecc..55c4b0a 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/listeners/AuctionListeners.java +++ b/src/main/java/ca/tweetzy/auctionhouse/listeners/AuctionListeners.java @@ -10,7 +10,6 @@ import ca.tweetzy.auctionhouse.auction.AuctionStat; import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType; import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.auctionhouse.transaction.Transaction; -import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/ca/tweetzy/auctionhouse/listeners/CMIListener.java b/src/main/java/ca/tweetzy/auctionhouse/listeners/CMIListener.java index ebc2636..46109a1 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/listeners/CMIListener.java +++ b/src/main/java/ca/tweetzy/auctionhouse/listeners/CMIListener.java @@ -1,10 +1,7 @@ package ca.tweetzy.auctionhouse.listeners; import ca.tweetzy.core.utils.nms.NBTEditor; -import com.Zrips.CMI.CMI; -import com.Zrips.CMI.Modules.CmiItems.CMIItemStack; import com.Zrips.CMI.events.CMIAnvilItemRepairEvent; -import com.Zrips.CMI.utils.CMINBTListType; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/ca/tweetzy/auctionhouse/listeners/EssentialsListener.java b/src/main/java/ca/tweetzy/auctionhouse/listeners/EssentialsListener.java index a3fe937..1d127d9 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/listeners/EssentialsListener.java +++ b/src/main/java/ca/tweetzy/auctionhouse/listeners/EssentialsListener.java @@ -1,6 +1,5 @@ package ca.tweetzy.auctionhouse.listeners; -import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; /** diff --git a/src/main/java/ca/tweetzy/auctionhouse/managers/AuctionStatManager.java b/src/main/java/ca/tweetzy/auctionhouse/managers/AuctionStatManager.java index c9bcc9f..763625d 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/managers/AuctionStatManager.java +++ b/src/main/java/ca/tweetzy/auctionhouse/managers/AuctionStatManager.java @@ -4,7 +4,6 @@ import ca.tweetzy.auctionhouse.AuctionHouse; import ca.tweetzy.auctionhouse.auction.AuctionStat; import lombok.Getter; import org.bukkit.OfflinePlayer; -import org.bukkit.entity.Player; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/ca/tweetzy/auctionhouse/managers/MinItemPriceManager.java b/src/main/java/ca/tweetzy/auctionhouse/managers/MinItemPriceManager.java index b0e73f4..a875261 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/managers/MinItemPriceManager.java +++ b/src/main/java/ca/tweetzy/auctionhouse/managers/MinItemPriceManager.java @@ -1,7 +1,6 @@ package ca.tweetzy.auctionhouse.managers; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.AuctionAPI; import ca.tweetzy.auctionhouse.auction.MinItemPrice; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/ca/tweetzy/auctionhouse/tasks/TickAuctionsTask.java b/src/main/java/ca/tweetzy/auctionhouse/tasks/TickAuctionsTask.java index 7d25e0b..be8c5dd 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/tasks/TickAuctionsTask.java +++ b/src/main/java/ca/tweetzy/auctionhouse/tasks/TickAuctionsTask.java @@ -151,7 +151,7 @@ public class TickAuctionsTask extends BukkitRunnable { // handle full inventory if (auctionWinner.getPlayer().getInventory().firstEmpty() == -1) { - if (Settings.ALLOW_PURCHASE_IF_INVENTORY_FULL.getBoolean() ) { + if (Settings.ALLOW_PURCHASE_IF_INVENTORY_FULL.getBoolean()) { if (Settings.SYNCHRONIZE_ITEM_ADD.getBoolean()) AuctionHouse.newChain().sync(() -> PlayerUtils.giveItem(auctionWinner.getPlayer(), itemStack)).execute(); else