Upstream/Auction-House
1
0
Fork 0
mirror of https://github.com/kiranhart/Auction-House.git synced 2025-02-03 17:11:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of the old auction item

Browse Source
This commit is contained in:
Kiran Hart 2022-01-17 13:46:09 -05:00
parent 780fc19cac
commit 594d037109
32 changed files with 43 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ca.tweetzy</groupId>
<artifactId>auctionhouse</artifactId>
<version>2.52.1-Dev</version>
<version>2.53.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -226,7 +226,7 @@
<dependency>
<groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId>
<version>2.1.205</version>
<version>2.1.202</version>
<scope>provided</scope>
</dependency>
<dependency>

3
src/main/java/ca/tweetzy/auctionhouse/AuctionHouse.java
View File

@ -184,7 +184,8 @@ public class AuctionHouse extends TweetyPlugin {
new _7_TransactionBigIntMigration(),
new _8_ItemPerWorldMigration(),
new _9_StatsMigration(),
new _10_InfiniteItemsMigration()
new _10_InfiniteItemsMigration(),
new _11_AdminLogMigration()
);
dataMigrationManager.runMigrations();

2
src/main/java/ca/tweetzy/auctionhouse/api/AuctionAPI.java
View File

@ -5,7 +5,7 @@ import ca.tweetzy.auctionhouse.api.events.AuctionStartEvent;
import ca.tweetzy.auctionhouse.api.hook.MMOItemsHook;
import ca.tweetzy.auctionhouse.api.hook.McMMOHook;
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
import ca.tweetzy.auctionhouse.auction.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.AuctionedItem;
import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper;
import ca.tweetzy.auctionhouse.helpers.MaterialCategorizer;

2
src/main/java/ca/tweetzy/auctionhouse/api/events/AuctionEndEvent.java
View File

@ -1,6 +1,6 @@
package ca.tweetzy.auctionhouse.api.events;
import ca.tweetzy.auctionhouse.auction.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.AuctionedItem;
import lombok.Getter;
import lombok.Setter;

1
src/main/java/ca/tweetzy/auctionhouse/auction/AuctionFilterItem.java
View File

@ -1,6 +1,7 @@
package ca.tweetzy.auctionhouse.auction;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.inventory.ItemStack;

124
src/main/java/ca/tweetzy/auctionhouse/auction/AuctionItem.java
View File

@ -1,124 +0,0 @@
package ca.tweetzy.auctionhouse.auction;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.core.utils.nms.NBTEditor;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
* The current file has been created by Kiran Hart
* Date Created: January 17 2021
* Time Created: 5:41 p.m.
* Usage of any code found within this class is prohibited unless given explicit permission otherwise
*/
@Getter
@Setter
public class AuctionItem implements Serializable {
private static final long serialVersionUID = 5679289273658775560L;
private UUID owner;
private UUID highestBidder;
private byte[] rawItem;
private AuctionItemCategory category;
private UUID key;
private double basePrice;
private double bidStartPrice;
private double bidIncPrice;
private double currentPrice;
private boolean expired;
private int remainingTime;
public AuctionItem() {
}
public AuctionItem(UUID owner, UUID highestBidder, ItemStack originalItem, AuctionItemCategory category, UUID key, double basePrice, double bidStartPrice, double bidIncPrice, double currentPrice, int remainingTime, boolean expired) {
this.owner = owner;
this.highestBidder = highestBidder;
this.rawItem = AuctionAPI.getInstance().serializeItem(originalItem);
this.category = category;
this.key = key;
this.basePrice = basePrice;
this.bidStartPrice = bidStartPrice;
this.bidIncPrice = bidIncPrice;
this.currentPrice = currentPrice;
this.remainingTime = remainingTime;
this.expired = expired;
}
public void updateRemainingTime(int removeAmount) {
this.remainingTime = Math.max(this.remainingTime - removeAmount, 0);
if (this.remainingTime <= 0) this.expired = true;
}
public String getItemName() {
ItemStack stack = AuctionAPI.getInstance().deserializeItem(this.rawItem);
if (stack == null) return "Invalid Item";
if (!stack.hasItemMeta()) return WordUtils.capitalize(stack.getType().name().toLowerCase().replace("_", " "));
return stack.getItemMeta().hasDisplayName() ? ChatColor.stripColor(stack.getItemMeta().getDisplayName()) : WordUtils.capitalize(stack.getType().name().toLowerCase().replace("_", " "));
}
public ItemStack getDisplayStack(AuctionStackType type) {
ItemStack itemStack = AuctionAPI.getInstance().deserializeItem(this.rawItem).clone();
itemStack.setAmount(Math.max(itemStack.getAmount(), 1));
ItemMeta meta = itemStack.hasItemMeta() ? itemStack.getItemMeta() : Bukkit.getItemFactory().getItemMeta(itemStack.getType());
List<String> lore = (meta.hasLore()) ? meta.getLore() : new ArrayList<>();
String theSeller = (this.owner == null) ? "&eSeller Name???" : Bukkit.getOfflinePlayer(this.owner).getName();
String highestBidder = (this.bidStartPrice <= 0 || this.bidIncPrice <= 0) ? "" : (this.owner.equals(this.highestBidder)) ? Bukkit.getOfflinePlayer(this.owner).getName() : Bukkit.getOfflinePlayer(this.highestBidder).getName();
// String basePrice = this.basePrice == -1 || !Settings.ALLOW_USAGE_OF_BUY_NOW_SYSTEM.getBoolean() && this.bidStartPrice >= 1 ? Settings.AUCTION_PURCHASE_CONTROLS_BUY_NOW_OFF_FOR_BID.getString() : Settings.USE_SHORT_NUMBERS_ON_ITEMS.getBoolean() ? AuctionAPI.getInstance().getFriendlyNumber(this.basePrice) : AuctionAPI.getInstance().formatNumber(this.basePrice);// base
//
// String bidIncPrice = (this.bidStartPrice <= 0 || this.bidIncPrice <= 0) ? "0" : Settings.USE_SHORT_NUMBERS_ON_ITEMS.getBoolean() ? AuctionAPI.getInstance().getFriendlyNumber(this.bidIncPrice) : AuctionAPI.getInstance().formatNumber(this.bidIncPrice);
// String currentPrice = (this.bidStartPrice <= 0 || this.bidIncPrice <= 0) ? "0" : Settings.USE_SHORT_NUMBERS_ON_ITEMS.getBoolean() ? AuctionAPI.getInstance().getFriendlyNumber(this.currentPrice) : AuctionAPI.getInstance().formatNumber(this.currentPrice);
//
// long[] times = AuctionAPI.getInstance().getRemainingTimeValues(this.remainingTime);
// List<String> preLore = type == AuctionStackType.MAIN_AUCTION_HOUSE ? this.bidStartPrice <= 0 || this.bidIncPrice <= 0 ? Settings.AUCTION_ITEM_AUCTION_STACK.getStringList() : Settings.AUCTION_ITEM_AUCTION_STACK_WITH_BID.getStringList() : this.bidStartPrice <= 0 ? Settings.AUCTION_ITEM_LISTING_STACK.getStringList() : Settings.AUCTION_ITEM_LISTING_STACK_WITH_BID.getStringList();
//
// lore.addAll(preLore.stream().map(line -> TextUtils.formatText(line
// .replace("%seller%", theSeller != null ? theSeller : "&eUnknown Seller")
// .replace("%buynowprice%", basePrice)
// .replace("%currentprice%", currentPrice)
// .replace("%bidincrement%", bidIncPrice)
// .replace("%highestbidder%", highestBidder != null ? highestBidder : "&eUnknown Bidder")
// .replace("%remaining_days%", String.valueOf(times[0]))
// .replace("%remaining_hours%", String.valueOf(times[1]))
// .replace("%remaining_minutes%", String.valueOf(times[2]))
// .replace("%remaining_seconds%", String.valueOf(times[3])))).collect(Collectors.toList()));
//
// if (type == AuctionStackType.MAIN_AUCTION_HOUSE) {
// lore.addAll(Settings.AUCTION_PURCHASE_CONTROL_HEADER.getStringList().stream().map(TextUtils::formatText).collect(Collectors.toList()));
// lore.addAll(this.bidStartPrice <= 0 || this.bidIncPrice <= 0 || !Settings.ALLOW_USAGE_OF_BUY_NOW_SYSTEM.getBoolean() ? Settings.AUCTION_PURCHASE_CONTROLS_BID_OFF.getStringList().stream().map(TextUtils::formatText).collect(Collectors.toList()) : Settings.AUCTION_PURCHASE_CONTROLS_BID_ON.getStringList().stream().map(TextUtils::formatText).collect(Collectors.toList()));
//
// if (NBTEditor.contains(itemStack, "AuctionBundleItem") || (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_11) && itemStack.getType().name().contains("SHULKER_BOX"))) {
// lore.addAll(Settings.AUCTION_PURCHASE_CONTROLS_INSPECTION.getStringList().stream().map(TextUtils::formatText).collect(Collectors.toList()));
// }
//
// lore.addAll(Settings.AUCTION_PURCHASE_CONTROL_FOOTER.getStringList().stream().map(TextUtils::formatText).collect(Collectors.toList()));
// } else {
// if (Settings.ALLOW_PLAYERS_TO_ACCEPT_BID.getBoolean() && this.bidStartPrice >= 1 || this.bidIncPrice >= 1) {
// if (!this.owner.equals(this.highestBidder)) {
// lore.addAll(Settings.AUCTION_PURCHASE_CONTROLS_ACCEPT_BID.getStringList().stream().map(TextUtils::formatText).collect(Collectors.toList()));
// }
// }
// }
meta.setLore(lore);
itemStack.setItemMeta(meta);
itemStack = NBTEditor.set(itemStack, getKey().toString(), "AuctionItemKey");
return itemStack;
}
}

3
src/main/java/ca/tweetzy/auctionhouse/auction/AuctionPlayer.java
View File

@ -1,6 +1,9 @@
package ca.tweetzy.auctionhouse.auction;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSortType;
import ca.tweetzy.auctionhouse.settings.Settings;
import lombok.Getter;
import lombok.Setter;

2
src/main/java/ca/tweetzy/auctionhouse/auction/AuctionedItem.java
View File

@ -2,6 +2,8 @@ package ca.tweetzy.auctionhouse.auction;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType;
import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.core.compatibility.ServerVersion;
import ca.tweetzy.core.utils.TextUtils;

2
src/main/java/ca/tweetzy/auctionhouse/auction/AuctionItemCategory.java → src/main/java/ca/tweetzy/auctionhouse/auction/enums/AuctionItemCategory.java
View File

@ -1,4 +1,4 @@
package ca.tweetzy.auctionhouse.auction;
package ca.tweetzy.auctionhouse.auction.enums;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.settings.Settings;

2
src/main/java/ca/tweetzy/auctionhouse/auction/AuctionSaleType.java → src/main/java/ca/tweetzy/auctionhouse/auction/enums/AuctionSaleType.java
View File

@ -1,4 +1,4 @@
package ca.tweetzy.auctionhouse.auction;
package ca.tweetzy.auctionhouse.auction.enums;
import ca.tweetzy.auctionhouse.AuctionHouse;

2
src/main/java/ca/tweetzy/auctionhouse/auction/AuctionSortType.java → src/main/java/ca/tweetzy/auctionhouse/auction/enums/AuctionSortType.java
View File

@ -1,4 +1,4 @@
package ca.tweetzy.auctionhouse.auction;
package ca.tweetzy.auctionhouse.auction.enums;
import ca.tweetzy.auctionhouse.AuctionHouse;

2
src/main/java/ca/tweetzy/auctionhouse/auction/AuctionStackType.java → src/main/java/ca/tweetzy/auctionhouse/auction/enums/AuctionStackType.java
View File

@ -1,4 +1,4 @@
package ca.tweetzy.auctionhouse.auction;
package ca.tweetzy.auctionhouse.auction.enums;
/**
* The current file has been created by Kiran Hart

2
src/main/java/ca/tweetzy/auctionhouse/commands/CommandFilter.java
View File

@ -3,7 +3,7 @@ package ca.tweetzy.auctionhouse.commands;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.auction.AuctionFilterItem;
import ca.tweetzy.auctionhouse.auction.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import ca.tweetzy.auctionhouse.guis.filter.GUIFilterWhitelist;
import ca.tweetzy.auctionhouse.helpers.PlayerHelper;
import ca.tweetzy.core.commands.AbstractCommand;

17
src/main/java/ca/tweetzy/auctionhouse/commands/CommandMigrate.java
View File

@ -22,22 +22,7 @@ public class CommandMigrate extends AbstractCommand {
@Override
protected ReturnType runCommand(CommandSender sender, String... args) {
if (args.length == 0) {
AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&cUse '/ah migrate confirm' to confirm the migration, please sure that you have made a backup of your auction house data.yml / auction house database tables. Although everything should work fine, there is always a chance that something wil go wrong.")).sendPrefixedMessage(sender);
return ReturnType.FAILURE;
}
if (args.length == 1 && !args[0].equalsIgnoreCase("confirm")) return ReturnType.SYNTAX_ERROR;
// Begin migration
AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&cMIGRATION STARTED")).sendPrefixedMessage(sender);
AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&eAuction House usage will be disabled until it is finished, this may take some time depending on how many items you have stored.")).sendPrefixedMessage(sender);
AuctionHouse.getInstance().getDataManager().migrateFromSerializationFormat(items -> {
AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&aMIGRATION FINISHED")).sendPrefixedMessage(sender);
AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&eConverted a total of " + items.size() + " to new format")).sendPrefixedMessage(sender);
AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&eYou can now use the auction house safely")).sendPrefixedMessage(sender);
});
AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&cMigration support for v1 has been dropped since 2.53.0, use 2.52.0 or lower to migrate first.")).sendPrefixedMessage(sender);
return ReturnType.SUCCESS;
}

2
src/main/java/ca/tweetzy/auctionhouse/commands/CommandSell.java
View File

@ -3,7 +3,7 @@ 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.auction.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import ca.tweetzy.auctionhouse.guis.GUIBundleCreation;
import ca.tweetzy.auctionhouse.guis.GUISellItem;
import ca.tweetzy.auctionhouse.guis.confirmation.GUIConfirmListing;

79
src/main/java/ca/tweetzy/auctionhouse/database/DataManager.java
View File

@ -3,6 +3,8 @@ package ca.tweetzy.auctionhouse.database;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.auction.*;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.auctionhouse.transaction.Transaction;
import ca.tweetzy.core.database.DataManagerAbstract;
@ -393,83 +395,6 @@ public class DataManager extends DataManagerAbstract {
}));
}
public void migrateFromSerializationFormat(Consumer<List<AuctionedItem>> callback) {
AuctionHouse.getInstance().setMigrating(true);
ArrayList<AuctionItem> items = new ArrayList<>();
this.async(() -> this.databaseConnector.connect(connection -> {
if (Settings.DATABASE_USE.getBoolean()) {
String select = "SELECT * FROM " + this.getTablePrefix() + "items";
try (Statement statement = connection.createStatement()) {
ResultSet result = statement.executeQuery(select);
while (result.next()) {
items.add((AuctionItem) AuctionAPI.getInstance().convertBase64ToObject(result.getString("data")));
}
}
} else {
if (AuctionHouse.getInstance().getData().contains("auction items") && AuctionHouse.getInstance().getData().isList("auction items")) {
items.addAll(AuctionHouse.getInstance().getData().getStringList("auction items").stream().map(AuctionAPI.getInstance()::convertBase64ToObject).map(object -> (AuctionItem) object).collect(Collectors.toList()));
AuctionHouse.getInstance().getData().set("auction items", null);
AuctionHouse.getInstance().getData().save();
}
}
List<AuctionedItem> newItems = new ArrayList<>();
items.forEach(item -> {
OfflinePlayer owner = Bukkit.getOfflinePlayer(item.getOwner());
OfflinePlayer highestBidder = Bukkit.getOfflinePlayer(item.getHighestBidder());
newItems.add(new AuctionedItem(
item.getKey(),
item.getOwner(),
item.getHighestBidder(),
owner.getName() != null ? owner.getName() : "Unknown",
highestBidder.getName() != null ? highestBidder.getName() : "Unknown",
item.getCategory(),
AuctionAPI.getInstance().deserializeItem(item.getRawItem()),
item.getBasePrice(),
item.getBidStartPrice(),
item.getBidIncPrice(),
item.getCurrentPrice(),
item.getBidStartPrice() >= 1 || item.getBidIncPrice() >= 1,
item.isExpired(),
System.currentTimeMillis() + 1000L * item.getRemainingTime()
));
});
String saveItems = "INSERT INTO " + this.getTablePrefix() + "auctions(id, owner, highest_bidder, owner_name, highest_bidder_name, category, base_price, bid_start_price, bid_increment_price, current_price, expired, expires_at, item_material, item_name, item_lore, item_enchants, item) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
PreparedStatement statement = connection.prepareStatement(saveItems);
newItems.forEach(item -> {
try {
statement.setString(1, item.getId().toString());
statement.setString(2, item.getOwner().toString());
statement.setString(3, item.getHighestBidder().toString());
statement.setString(4, item.getOwnerName());
statement.setString(5, item.getHighestBidderName());
statement.setString(6, item.getCategory().name());
statement.setDouble(7, item.getBasePrice());
statement.setDouble(8, item.getBidStartingPrice());
statement.setDouble(9, item.getBidIncrementPrice());
statement.setDouble(10, item.getCurrentPrice());
statement.setBoolean(11, item.isExpired());
statement.setLong(12, item.getExpiresAt());
statement.setString(13, item.getItem().getType().name());
statement.setString(14, AuctionAPI.getInstance().getItemName(item.getItem()));
statement.setString(15, AuctionAPI.getInstance().serializeLines(AuctionAPI.getInstance().getItemLore(item.getItem())));
statement.setString(16, AuctionAPI.getInstance().serializeLines(AuctionAPI.getInstance().getItemEnchantments(item.getItem())));
statement.setString(17, AuctionAPI.encodeItem(item.getItem()));
statement.addBatch();
} catch (SQLException e) {
e.printStackTrace();
}
});
statement.executeBatch();
this.sync(() -> {
AuctionHouse.getInstance().setMigrating(false);
newItems.forEach(item -> AuctionHouse.getInstance().getAuctionItemManager().addAuctionItem(item));
callback.accept(newItems);
});
}));
}
private AuctionedItem extractAuctionedItem(ResultSet resultSet) throws SQLException {
AuctionedItem auctionItem = new AuctionedItem(
UUID.fromString(resultSet.getString("id")),

2
src/main/java/ca/tweetzy/auctionhouse/guis/GUIActiveAuctions.java
View File

@ -2,7 +2,7 @@ package ca.tweetzy.auctionhouse.guis;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
import ca.tweetzy.auctionhouse.auction.AuctionStackType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType;
import ca.tweetzy.auctionhouse.auction.AuctionedItem;
import ca.tweetzy.auctionhouse.guis.confirmation.GUIConfirmCancel;
import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper;

4
src/main/java/ca/tweetzy/auctionhouse/guis/GUIAuctionHouse.java
View File

@ -5,6 +5,10 @@ import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.api.events.AuctionBidEvent;
import ca.tweetzy.auctionhouse.api.hook.FloodGateHook;
import ca.tweetzy.auctionhouse.auction.*;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSortType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType;
import ca.tweetzy.auctionhouse.guis.confirmation.GUIConfirmBid;
import ca.tweetzy.auctionhouse.guis.confirmation.GUIConfirmPurchase;
import ca.tweetzy.auctionhouse.guis.filter.GUIFilterSelection;

2
src/main/java/ca/tweetzy/auctionhouse/guis/GUISellItem.java
View File

@ -3,7 +3,7 @@ package ca.tweetzy.auctionhouse.guis;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
import ca.tweetzy.auctionhouse.auction.AuctionSaleType;
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;

2
src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmCancel.java
View File

@ -2,7 +2,7 @@ package ca.tweetzy.auctionhouse.guis.confirmation;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
import ca.tweetzy.auctionhouse.auction.AuctionStackType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType;
import ca.tweetzy.auctionhouse.auction.AuctionedItem;
import ca.tweetzy.auctionhouse.guis.GUIActiveAuctions;
import ca.tweetzy.auctionhouse.settings.Settings;

2
src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmPurchase.java
View File

@ -4,7 +4,7 @@ import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.api.events.AuctionEndEvent;
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
import ca.tweetzy.auctionhouse.auction.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.AuctionedItem;
import ca.tweetzy.auctionhouse.exception.ItemNotFoundException;
import ca.tweetzy.auctionhouse.guis.GUIAuctionHouse;

2
src/main/java/ca/tweetzy/auctionhouse/guis/filter/GUIFilterSelection.java
View File

@ -2,7 +2,7 @@ package ca.tweetzy.auctionhouse.guis.filter;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.auction.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
import ca.tweetzy.auctionhouse.guis.GUIAuctionHouse;
import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper;

2
src/main/java/ca/tweetzy/auctionhouse/guis/filter/GUIFilterWhitelist.java
View File

@ -1,6 +1,6 @@
package ca.tweetzy.auctionhouse.guis.filter;
import ca.tweetzy.auctionhouse.auction.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper;
import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.core.gui.Gui;

2
src/main/java/ca/tweetzy/auctionhouse/guis/filter/GUIFilterWhitelistList.java
View File

@ -2,7 +2,7 @@ package ca.tweetzy.auctionhouse.guis.filter;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.auction.AuctionFilterItem;
import ca.tweetzy.auctionhouse.auction.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.core.gui.Gui;
import ca.tweetzy.core.utils.TextUtils;

2
src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionView.java
View File

@ -3,7 +3,7 @@ package ca.tweetzy.auctionhouse.guis.transaction;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
import ca.tweetzy.auctionhouse.auction.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper;
import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.auctionhouse.transaction.Transaction;

2
src/main/java/ca/tweetzy/auctionhouse/helpers/MaterialCategorizer.java
View File

@ -1,6 +1,6 @@
package ca.tweetzy.auctionhouse.helpers;
import ca.tweetzy.auctionhouse.auction.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import ca.tweetzy.core.compatibility.XMaterial;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;

2
src/main/java/ca/tweetzy/auctionhouse/listeners/AuctionListeners.java
View File

@ -5,7 +5,7 @@ import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.api.events.AuctionBidEvent;
import ca.tweetzy.auctionhouse.api.events.AuctionEndEvent;
import ca.tweetzy.auctionhouse.api.events.AuctionStartEvent;
import ca.tweetzy.auctionhouse.auction.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.AuctionStat;
import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.auctionhouse.transaction.Transaction;

2
src/main/java/ca/tweetzy/auctionhouse/managers/FilterManager.java
View File

@ -3,7 +3,7 @@ package ca.tweetzy.auctionhouse.managers;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.auction.AuctionFilterItem;
import ca.tweetzy.auctionhouse.auction.AuctionItemCategory;
import ca.tweetzy.auctionhouse.auction.enums.AuctionItemCategory;
import org.bukkit.inventory.ItemStack;
import java.util.ArrayList;

4
src/main/java/ca/tweetzy/auctionhouse/settings/LocaleSettings.java
View File

@ -135,6 +135,10 @@ public class LocaleSettings {
languageNodes.put("auction.tax.cannotpaylistingfee", "&cYou do not have enough money to pay the listing fee &f(&4$%price%&f)");
languageNodes.put("auction.tax.paidlistingfee", "&aPaid &2$%price%&a listing fee");
languageNodes.put("admin action.return", "Returned");
languageNodes.put("admin action.claim", "Claimed");
languageNodes.put("admin action.delete", "Deleted");
languageNodes.put("admin action.copy", "Copied");
languageNodes.put("commands.invalid_syntax", "&7The valid syntax is: &6%syntax%&7.");
languageNodes.put("commands.no_permission", "&dYou do not have permission to do that.");

1
src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java
View File

@ -55,6 +55,7 @@ public class Settings {
public static final ConfigSetting PREVENT_SALE_OF_REPAIRED_ITEMS = new ConfigSetting(config, "auction setting.prevent sale of repaired items", false, "Items repaired before this setting is turned on will still be able to be listed.");
public static final ConfigSetting SYNCHRONIZE_ITEM_ADD = new ConfigSetting(config, "auction setting.synchronize item add", false, "If an item is being added to a player's inventory, the process will be ran synchronously");
public static final ConfigSetting ITEM_COPY_REQUIRES_GMC = new ConfigSetting(config, "auction setting.admin copy requires creative", false, "If true when using the admin copy option the player must be in creative");
public static final ConfigSetting LOG_ADMIN_ACTIONS = new ConfigSetting(config, "auction setting.log admin actions", true, "If true, any admin actions made will be logged");
public static final ConfigSetting TICK_UPDATE_TIME = new ConfigSetting(config, "auction setting.tick auctions every", 1, "How many seconds should pass before the plugin updates all the times on items?");
public static final ConfigSetting CLAIM_MS_DELAY = new ConfigSetting(config, "auction setting.item claim delay", 100, "How many ms should a player wait before being allowed to claim an item?, Ideally you don't wanna change this. It's meant to prevent auto clicker dupe claims");

2
src/main/java/ca/tweetzy/auctionhouse/tasks/TickAuctionsTask.java
View File

@ -3,7 +3,7 @@ package ca.tweetzy.auctionhouse.tasks;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.api.events.AuctionEndEvent;
import ca.tweetzy.auctionhouse.auction.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.AuctionStat;
import ca.tweetzy.auctionhouse.auction.AuctionedItem;
import ca.tweetzy.auctionhouse.settings.Settings;

2
src/main/java/ca/tweetzy/auctionhouse/transaction/Transaction.java
View File

@ -1,6 +1,6 @@
package ca.tweetzy.auctionhouse.transaction;
import ca.tweetzy.auctionhouse.auction.AuctionSaleType;
import ca.tweetzy.auctionhouse.auction.enums.AuctionSaleType;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;